diff options
| -rw-r--r-- | media-libs/imlib2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/imlib2/Manifest | 33 | ||||
| -rw-r--r-- | media-libs/imlib2/imlib2-9999-r1.ebuild | 68 | ||||
| -rw-r--r-- | media-libs/imlib2/imlib2-9999.ebuild | 40 |
4 files changed, 40 insertions, 107 deletions
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog index e96d6bf960fe..2514d8e375a3 100644 --- a/media-libs/imlib2/ChangeLog +++ b/media-libs/imlib2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/imlib2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.122 2014/05/17 07:46:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.123 2014/05/17 07:54:31 mgorny Exp $ + + 17 May 2014; Michał Górny <mgorny@gentoo.org> -imlib2-9999-r1.ebuild, + imlib2-9999.ebuild: + Collapse the live ebuilds, and forward-port the MULTILIB_USEDEP fix. 17 May 2014; Michał Górny <mgorny@gentoo.org> imlib2-1.4.6-r2.ebuild: Add missing MULTILIB_USEDEPs. diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest index 8d69f18178fb..2007b04f4db1 100644 --- a/media-libs/imlib2/Manifest +++ b/media-libs/imlib2/Manifest @@ -8,26 +8,25 @@ DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169a EBUILD imlib2-1.4.5-r1.ebuild 1777 SHA256 0a31e394a6f507a23757023afc933894eab79cb20d6f5a96d5a988e086d04bb2 SHA512 f204428f402c698bc0cdca2985aa8746551faa3e880a938a754d38fa6ae03b4c24b819d59df3eda542d518dc1ef0b06f82543df224ec8387c7e450ab7eee1608 WHIRLPOOL edb8d980511245bfe35d5e1429bb00476ebd542b0746ac752a8c516a36505d9611ee4c21c8a3289f2ebdf1fafe6de4c8bc5bacdc98ee8b67b22c9669fdfd266b EBUILD imlib2-1.4.6-r1.ebuild 1774 SHA256 f27cedffadd9768c0b5ff4d1f8d5cb9653c1cd94fd380afaf940c233951f7479 SHA512 c4b133b05da40487a326f21456bf47ef83c25b108fd068556ed4144aecf2e0fec91ca2da5f6d30568c5d7611447b371aad3e4cba488bb4c89a0d0ab8f2094ac1 WHIRLPOOL 8a2aa70271484a4024fa64f3b1849a5ed9717254da1f58c92052b9a10f112b68e5a28e652059d5d58ae4260537a82cf60ffb7cdc5b0f18da1d0a5f74de236854 EBUILD imlib2-1.4.6-r2.ebuild 2133 SHA256 a4df1e2a4463c9d6d1451612c2d01506266984c14405833aa7b4647185ef9ca8 SHA512 d124ad1736d57c501b990a2b12f7be62008e3abe7121c0d29229d9d218ef3bcaf4dcf5bec0161db3fd8d7e2c4aa52d23f446f90a28b0a1a19e7a2205a3743165 WHIRLPOOL b12ce582ab9346d22881ba30c72e7509e3bccd9cbf6f26caf2556a0d043e6a0af39bccc8d6028a39ae429dd27f417d61a3f4533c7ddaa925a924ebf71777e04d -EBUILD imlib2-9999-r1.ebuild 1787 SHA256 307962dcf6043f2ad82969a841d9cf50c4a525c861cd3c44f173ebdd5669bb4a SHA512 fd83b1e4dd5d2d3ca0a78fcf178257bf21a51f21969581e974835f1b749156d0d81d27a64b14997ea81cddd59ec1fe23b25acf506b408bd667bb7ccc6ee61c97 WHIRLPOOL 579e053380017274aab4c6017b08e5eb6869431f52098f8795df690517f261f73053604ec6a0eb20d2cf5110224608d78de3da326c996852ad7a91e387a8bfa6 -EBUILD imlib2-9999.ebuild 1638 SHA256 d7866fd2dfbc16f6c175ef4241a93bcd743ab8677974f1bc17434e69ef991b94 SHA512 af1d51138de619470f7bf8dfe16204b0e7eee56a711b25d79d4e30bf03c436b2bee4506b1596c83dd6cf80e0e2def633a823fdf5045ea18871765b7b30e2c549 WHIRLPOOL e424e2942d72f690d8601e5e6d8ed4c2b5c7e3a7ff2c0a5197e8cfb84316f0ae0a55a76f196dc9d3848fca1a5f8554433401ec6fbc6dbbda9b0cd203a8db9220 -MISC ChangeLog 15164 SHA256 b2392bb3bfec23cc6069e3200bb5fb7f2e560befba0a84291147df32ecdc3075 SHA512 655d3f23ce2a9f684b27102a866fb3510c66fd38465b41eb2c50913202747d602580c6e0168412e9ed91698ae343a3314f34a646c1f384911cecdb1044d63ccc WHIRLPOOL ddf277ce035cc0ef8a0ce793935e073eabcae25dce688f1107d29f638387df12eb9f516bf15b325d7e0428db464b59b4541f1f1e0caa8c1272cf6d86aa5ced9b +EBUILD imlib2-9999.ebuild 1843 SHA256 3e6534fd4818f09bad210c026904f7385bbbe3e28b63280b57fbde5e3f9e5cd6 SHA512 970b944223c7b857b9c42eaade40c31b4429cbd88774db6928cdc9be95712b08300d7e8c276954f1ea4a512c72a9c87f8c8637a184e52fee7e15cd8286d46f2d WHIRLPOOL a95636f90c7f462987de32218d2570bcf8f96f7d742aeb62fe1bbdec140e700b90da3bc55aa798f83d9db25149342820ed1735090a7d44b96b352eda0973e5cc +MISC ChangeLog 15332 SHA256 bba2e2849b50ee7baaf8975b8ce2296b8517598117bb311c46b58550d74a45d3 SHA512 7f6b1dd34705eb45b313d2a6b343ca24abdb3c963c8e184505d1e2c7a1b318c66be584ac2157ea8c925dde61edfd9f45ed73e9f8e9f4c3982b7dae6772af9a53 WHIRLPOOL 66f7477a4a331e6f46db3a3b8225b8757a73ffcad0fb2135566df26d003f1c255c4b1ba2d6c422a1bd82d907cd040ab09517057efbf68efae3b6f323116ab89c MISC metadata.xml 2200 SHA256 343b4e61546c7f2a89249bd63c4018975cbc53bd8622d641d27dc05f8aa5235a SHA512 1993bd9088534da0122db66e83017259423f79f4dd9de442f4f4dec6fe4398979813ae83f0a7640630da1f6fcf2b8ab59d64ed5cba09144cd243f232618501f1 WHIRLPOOL bbd8aafa47c63e0b32b888e89a62d321591a2c43ea0b3d816206c62f2a0381de89c554a84479727a281957c8b707175c8b125c47135ccf17d707928cadc51ff8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTdxPEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTdxW4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOiKkP/idkFDkJ6wiM1vvBZaaLrwze -X52QS4Mj795ZkFM5X3q97XeBsLR0Vih2ZFhNmWPn8OIwHAItj/Qz2LaNF/S30CN/ -PofdcBLVJaDuMJhvxT6ZD2M3Bjz9SG1KaIrSz5bM2DphAH239tsVKxpmD2VQsjwW -ghBtAPj/Xmxf/SpHgv6qtY0XjDV3P8RliqKb1rz/XStHgDO8NMwY9gyJzfoaCJSi -h/Nu8c1XODtaFRRpSC41M1i78de2tfCdAZ3+7gZ+knn4oj0uuv+zksxtlc21aYx+ -vc/z1fRl7KltDjao8TmQVIqaOHfs6AUL7esvNSO4ewL6SKj1/d1XQCYspGfac9Cz -BE2AuEVy/IaYuHBegTaP9pcV0KKz+0WdbOrptaqtct8iWUg9in83jpEjSceUeMoA -lQvUj6tZsTENqKCRU7ypo6Vqsz2W4y63JMzRycz3Bz0gNREi4RXKLFO/l3n9x3EB -0b9hQIPxOc9WnIvePNNQWXMlNTiqs9BrzhGOtIO+b6R/ZYl5tymWhMPyNSfi6h6V -QbFgLk6gOOElen2Hf38MJOpyLopm9N2ayh95Ydv4q6kYW4YCkvlVs3ReKcVJzA5O -+UG/pm7YgeWHuccyYZkN4sWoIriFUYZ2dasPk44Mra2cUroYc6cwMCBdORGAU2h3 -BPhzwwH05xxxRCRw21Kd -=yfbD +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO194P/ir5LQtee4L6dZXuTl1kx9ie +nrRFG41vs4Z274bZ5WDcToJq8l2szm9lYLjfZhvwJwxzsXzfa3l4nOGSg/6wSpSd +6es2+8eRIwjRcTueIxjRfZXingvvxhZTtgkQvsaa/Od9MLyzc2et2MhZuAMHUKz9 +MVhnp+mkOCTYkyDZRC8xQ+v/0FibTj/hmdupQ0tUM+lfjfA/k4J9BBm/Av8Osy/n +iMah5EOqTBYBYx8WD7rMJm0aEfO9zwR/u1/1opG4QuAV9fFsLjLs8Mt7lt9VtVvq +PxDjIn2sEWphBKPlbG2hBBqpKwkeR6g6z4pGnLjv7Qpt2lz1Ims8njwQ0iGd1XyI +df7e4cySHWgpH0GYXN22xZrBQ6+1aKm94ScqacorhDcXY65V7Gh8nUs6kIjewsFZ +dKWtnabOPCAyztHMuzBlYVdwue4VpVKOQcdRDsdnX+EqE+gFsYQDZ1n6Ml3ZOIj2 +aUD1jTW7lbNlVSEQJKbMCfFH4WuTPk4S961V9GswikgBaM7viA6iZmvbRFw7ttkN +KpFI19Di1KnvFa/4WwUz0Yr++k5gn1WXuimcwPbIGZX7AnuJmEoIl6pZcJ+sOtrQ +1r4aAlDzYdlsAZMHLduLDZpGAeUXcFCPuoIiraNuAva9KQbMGHdZVF7eLbJpN5qq +otSFAdCWLN29Nb1wsIWF +=EUKR -----END PGP SIGNATURE----- diff --git a/media-libs/imlib2/imlib2-9999-r1.ebuild b/media-libs/imlib2/imlib2-9999-r1.ebuild deleted file mode 100644 index ce1a4e92c743..000000000000 --- a/media-libs/imlib2/imlib2-9999-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999-r1.ebuild,v 1.1 2014/04/18 15:24:11 hasufell Exp $ - -EAPI="4" - -EGIT_SUB_PROJECT="legacy" -EGIT_URI_APPEND=${PN} - -if [[ ${PV} != "9999" ]] ; then - EKEY_STATE="stable" -fi - -inherit enlightenment toolchain-funcs multilib-minimal - -DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" -HOMEPAGE="http://www.enlightenment.org/" - -IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib" - -RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}] - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) - gif? ( >=media-libs/giflib-4.1.0[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0[${MULTILIB_USEDEP}] ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - ) - mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - png? ( virtual/pkgconfig ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -multilib_src_configure() { - # imlib2 has diff configure options for x86/amd64 mmx - if [[ $(tc-arch) == amd64 ]]; then - E_ECONF+=( $(use_enable mmx amd64) --disable-mmx ) - else - E_ECONF+=( --disable-amd64 $(use_enable mmx) ) - fi - - [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) - - ECONF_SOURCE="${S}" \ - E_ECONF+=( - $(use_enable static-libs static) - $(use_with X x) - $(use_with jpeg) - $(use_with png) - $(use_with tiff) - $(use_with gif) - $(use_with zlib) - $(use_with bzip2) - $(use_with mp3 id3) - ) - - enlightenment_src_configure -} - -multilib_src_install() { - enlightenment_src_install -} diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild index 4434dd7317d6..661c8e364f61 100644 --- a/media-libs/imlib2/imlib2-9999.ebuild +++ b/media-libs/imlib2/imlib2-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.18 2013/09/28 09:37:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.19 2014/05/17 07:54:31 mgorny Exp $ EAPI="4" @@ -11,33 +11,33 @@ if [[ ${PV} != "9999" ]] ; then EKEY_STATE="stable" fi -inherit enlightenment toolchain-funcs +inherit enlightenment toolchain-funcs multilib-minimal DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" HOMEPAGE="http://www.enlightenment.org/" IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib" -RDEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) +RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}] + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + gif? ( >=media-libs/giflib-4.1.0[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0[${MULTILIB_USEDEP}] ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11 - x11-libs/libXext + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] ) - mp3? ( media-libs/libid3tag )" + mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - png? ( virtual/pkgconfig ) + png? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) X? ( - x11-proto/xextproto - x11-proto/xproto + x11-proto/xextproto[${MULTILIB_USEDEP}] + x11-proto/xproto[${MULTILIB_USEDEP}] )" -src_configure() { +multilib_src_configure() { # imlib2 has diff configure options for x86/amd64 mmx if [[ $(tc-arch) == amd64 ]]; then E_ECONF+=( $(use_enable mmx amd64) --disable-mmx ) @@ -47,6 +47,7 @@ src_configure() { [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) + ECONF_SOURCE="${S}" \ E_ECONF+=( $(use_enable static-libs static) $(use_with X x) @@ -62,9 +63,6 @@ src_configure() { enlightenment_src_configure } -src_install() { +multilib_src_install() { enlightenment_src_install - - # enlightenment_src_install should take care of this for us, but it doesn't - find "${ED}" -name '*.la' -delete } |