commit: be515c587fdcdb175c5cdcf22a8cabaeb8c65104 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Oct 7 14:16:18 2019 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Mon Oct 7 14:26:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be515c58
media-libs/libprojectm: Moved virtual/pkgconfig to BDEPEND minor ebuild adjustments Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/13197 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../libprojectm/libprojectm-3.1.1_rc5-r1.ebuild | 16 ++++++++++------ media-libs/libprojectm/libprojectm-9999.ebuild | 21 +++++++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/media-libs/libprojectm/libprojectm-3.1.1_rc5-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.1_rc5-r1.ebuild index 70df39cf0c2..19885a4052b 100644 --- a/media-libs/libprojectm/libprojectm-3.1.1_rc5-r1.ebuild +++ b/media-libs/libprojectm/libprojectm-3.1.1_rc5-r1.ebuild @@ -35,8 +35,10 @@ RDEPEND="gles2? ( media-libs/mesa[gles2] ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" src_prepare() { default @@ -44,9 +46,11 @@ src_prepare() { } src_configure() { - econf \ - $(use_enable gles2 gles ) \ - $(use_enable qt5 qt ) \ - $(use_enable sdl ) \ + local myeconfargs=( + $(use_enable gles2 gles) + $(use_enable qt5 qt) + $(use_enable sdl) --enable-emscripten=no + ) + econf "${myeconfargs[@]}" } diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild index 01b1d4b50af..19885a4052b 100644 --- a/media-libs/libprojectm/libprojectm-9999.ebuild +++ b/media-libs/libprojectm/libprojectm-9999.ebuild @@ -12,9 +12,10 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"; inherit git-r3 else - SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + MY_PV="${PV/_/-}" + SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" - S=${WORKDIR}/projectm-${PV}/ + S=${WORKDIR}/projectm-${MY_PV}/ fi LICENSE="LGPL-2" @@ -34,8 +35,10 @@ RDEPEND="gles2? ( media-libs/mesa[gles2] ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" src_prepare() { default @@ -43,9 +46,11 @@ src_prepare() { } src_configure() { - econf \ - $(use_enable gles2 gles ) \ - $(use_enable qt5 qt ) \ - $(use_enable sdl ) \ + local myeconfargs=( + $(use_enable gles2 gles) + $(use_enable qt5 qt) + $(use_enable sdl) --enable-emscripten=no + ) + econf "${myeconfargs[@]}" }
