commit:     e858494a782c5b292b217bc3e61120aaad1147c7
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 12:24:45 2019 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 12:29:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e858494a

media-libs/babl: 0.1.72 with meson + sync 9999

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.68, Repoman-2.3.16

 media-libs/babl/Manifest                           |  1 +
 .../babl/{babl-9999.ebuild => babl-0.1.72.ebuild}  | 45 +++++++++-------------
 media-libs/babl/babl-9999.ebuild                   | 45 +++++++++-------------
 3 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index baf04eb8cd7..8ac6ad93b64 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,3 +3,4 @@ DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 
8bc43a7e0b7265f72122743ff4b3e25825e4bbe6
 DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 
21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3
 SHA512 
4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
 DIST babl-0.1.64.tar.bz2 705991 BLAKE2B 
a22522f3c9ce73b4a0d29f2dddae870e7d241c4456295cab8b3a1d6441dcc7221c510ace57ba22a86ad8aff605734430396b65dbad3a51d306344d0a230034bc
 SHA512 
b728c2973f80b62e2ee62307880e00a95a90839e778644dd6ab4076e43708e4939c8162b9a6a474dc3c3c4c087475d51eb64d2effd6dcdf969696060cc22a8aa
 DIST babl-0.1.66.tar.bz2 706100 BLAKE2B 
0de443dd4ea32cd025c8b121f042c24528677f32a6c201f3abedd13fb3a2ce2636d03f4b45eefce2c9f7a86426355af9b584602ca9ebb1a2140ee88f500c2843
 SHA512 
41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
+DIST babl-0.1.72.tar.xz 293660 BLAKE2B 
454b663753597c9b626f8fd1f6604e50cd0e9f5e4a62c8646b6904e97f79ed29a3e151a70593f191bed098192b3993e7f05049b3d6533ece0ac901cf00515cd0
 SHA512 
55425688467d565acecbe3657ed4191971fe70d0da0f69c348eec8a6db9807f3e27f5101cade2d886d017b5156e4ef56382df93f26cc335acb4ce33bbef23d6b

diff --git a/media-libs/babl/babl-9999.ebuild 
b/media-libs/babl/babl-0.1.72.ebuild
similarity index 50%
copy from media-libs/babl/babl-9999.ebuild
copy to media-libs/babl/babl-0.1.72.ebuild
index 634e2a1ade6..7aeda229c13 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-0.1.72.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=7
 
+inherit meson
+
 if [[ ${PV} == *9999* ]]; then
-       inherit autotools git-r3
+       inherit git-r3
        EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git";
        SRC_URI=""
 else
-       SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2";
+       SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
 fi
 
@@ -17,38 +19,29 @@ HOMEPAGE="http://www.gegl.org/babl/";
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 
cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 
cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c 
introspection lcms"
 
-RDEPEND=""
+RDEPEND="lcms? ( media-libs/lcms:2 )"
 DEPEND="${RDEPEND}
-       >=sys-devel/libtool-2.2
        virtual/pkgconfig
 "
 
-src_prepare() {
-       default
-       [[ ${PV} == *9999* ]] && eautoreconf
-}
-
 src_configure() {
        # Automagic rsvg support is just for website generation we do not call,
        #     so we don't need to fix it
        # w3m is used for dist target thus no issue for us that it is 
automagically
        #     detected
-       econf \
-               --disable-docs \
-               --disable-static \
-               --disable-maintainer-mode \
-               $(use_enable altivec) \
-               $(use_enable cpu_flags_x86_f16c f16c) \
-               $(use_enable cpu_flags_x86_mmx mmx) \
-               $(use_enable cpu_flags_x86_sse sse) \
-               $(use_enable cpu_flags_x86_sse2 sse2) \
-               $(use_enable cpu_flags_x86_sse3 sse3) \
-               $(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-       default
-       find "${D}" -name '*.la' -type f -delete || die
+       local emesonargs=(
+               $(meson_use cpu_flags_x86_mmx enable-mmx)
+               $(meson_use cpu_flags_x86_sse enable-sse)
+               $(meson_use cpu_flags_x86_sse2 enable-sse2)
+               $(meson_use cpu_flags_x86_sse3 enable-sse3)
+               $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+               $(meson_use cpu_flags_x86_avx2 enable-avx2)
+               $(meson_use cpu_flags_x86_f16c enable-f16c)
+               $(meson_use introspection enable-gir)
+               -Dwith-docs=false
+               $(meson_use lcms with-lcms)
+       )
+       meson_src_configure
 }

diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 634e2a1ade6..7aeda229c13 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=7
 
+inherit meson
+
 if [[ ${PV} == *9999* ]]; then
-       inherit autotools git-r3
+       inherit git-r3
        EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git";
        SRC_URI=""
 else
-       SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2";
+       SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
 fi
 
@@ -17,38 +19,29 @@ HOMEPAGE="http://www.gegl.org/babl/";
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 
cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 
cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c 
introspection lcms"
 
-RDEPEND=""
+RDEPEND="lcms? ( media-libs/lcms:2 )"
 DEPEND="${RDEPEND}
-       >=sys-devel/libtool-2.2
        virtual/pkgconfig
 "
 
-src_prepare() {
-       default
-       [[ ${PV} == *9999* ]] && eautoreconf
-}
-
 src_configure() {
        # Automagic rsvg support is just for website generation we do not call,
        #     so we don't need to fix it
        # w3m is used for dist target thus no issue for us that it is 
automagically
        #     detected
-       econf \
-               --disable-docs \
-               --disable-static \
-               --disable-maintainer-mode \
-               $(use_enable altivec) \
-               $(use_enable cpu_flags_x86_f16c f16c) \
-               $(use_enable cpu_flags_x86_mmx mmx) \
-               $(use_enable cpu_flags_x86_sse sse) \
-               $(use_enable cpu_flags_x86_sse2 sse2) \
-               $(use_enable cpu_flags_x86_sse3 sse3) \
-               $(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-       default
-       find "${D}" -name '*.la' -type f -delete || die
+       local emesonargs=(
+               $(meson_use cpu_flags_x86_mmx enable-mmx)
+               $(meson_use cpu_flags_x86_sse enable-sse)
+               $(meson_use cpu_flags_x86_sse2 enable-sse2)
+               $(meson_use cpu_flags_x86_sse3 enable-sse3)
+               $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+               $(meson_use cpu_flags_x86_avx2 enable-avx2)
+               $(meson_use cpu_flags_x86_f16c enable-f16c)
+               $(meson_use introspection enable-gir)
+               -Dwith-docs=false
+               $(meson_use lcms with-lcms)
+       )
+       meson_src_configure
 }

Reply via email to