summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-09-28 09:37:36 +0000
committerMike Frysinger <vapier@gentoo.org>2013-09-28 09:37:36 +0000
commit09a7fd10f93d5cb8dad7667274ffe2d9ab00af6c (patch)
treee59d2219e0a138600b25b50a5ec6c517c5b67e14 /media-libs/imlib2
parentAdd epatch_user. This fixes bug #478482. (diff)
downloadhistorical-09a7fd10f93d5cb8dad7667274ffe2d9ab00af6c.tar.gz
historical-09a7fd10f93d5cb8dad7667274ffe2d9ab00af6c.tar.bz2
historical-09a7fd10f93d5cb8dad7667274ffe2d9ab00af6c.zip
Clean up ebuild and merge live git version from E overlay.
Package-Manager: portage-2.2.0/cvs/Linux x86_64 Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'media-libs/imlib2')
-rw-r--r--media-libs/imlib2/ChangeLog9
-rw-r--r--media-libs/imlib2/Manifest30
-rw-r--r--media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch82
-rw-r--r--media-libs/imlib2/imlib2-1.4.4.ebuild55
-rw-r--r--media-libs/imlib2/imlib2-1.4.5.ebuild33
-rw-r--r--media-libs/imlib2/imlib2-9999.ebuild70
-rw-r--r--media-libs/imlib2/metadata.xml4
7 files changed, 115 insertions, 168 deletions
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index c53a477a5bd0..22ea8380fbcb 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/imlib2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.116 2013/08/13 07:56:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.117 2013/09/28 09:37:31 vapier Exp $
+
+*imlib2-9999 (28 Sep 2013)
+
+ 28 Sep 2013; Mike Frysinger <vapier@gentoo.org> +imlib2-9999.ebuild,
+ -files/imlib2-1.4.4-libpng-1.5.patch, -imlib2-1.4.4.ebuild,
+ imlib2-1.4.5.ebuild, metadata.xml:
+ Clean up ebuild and merge live git version from E overlay.
13 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> imlib2-1.4.4.ebuild,
imlib2-1.4.5.ebuild:
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index b015f79e5894..bfbd8e1c64d0 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,21 +1,25 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX imlib2-1.4.4-libpng-1.5.patch 2540 SHA256 5c4e0f1c5a4543e9f92f2974c7c996244274a1498bcb7083301d1153d6d79980 SHA512 ebd857e68bc2254f14992e234cdd812c9dea7c9746243add43fcc17bd51f353efe609d1748f77d797ef93b0bfabd7f1d6e7b5eb75868c892536ebae9053bc0a5 WHIRLPOOL beba2bb4e9df7f66e7437a89e2aa8581ed6bda0c6e0dcfd5056ef43d523ca02abe2c533d87ff7cb969fd2dcff19bd16b5faa86e45c64e0c73022d30b0a32a0fa
-DIST imlib2-1.4.4.tar.gz 977630 SHA256 a4de52c90b8cd155b41ca70c2d34209f7b94a9e4f8e77582f2682a1795306198 SHA512 657ca882e7358fb021ce08247f1f7dedee1aeb0e5fb7daa2dec4bf4859106801429eef3404ddb263fc3eccfde631d8559a69fec9f0cf23a6ca45bcbc98d3a380 WHIRLPOOL 4432edb84ea07c1d71d1e53459eea3378a18d1916a3d0b5514dbbc20b693197c3b10374b04b89caf0e268257963e0d3b33b8670242844e1fa5bb3cb70ff9c2cf
DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c
-EBUILD imlib2-1.4.4.ebuild 1508 SHA256 9aefb32798ef7d6566afb5d160e26ad996af3d4c399e86c458fc6aa352f2b228 SHA512 041a079eca66e3c066916a8db359ed408a79baff91d8ac771b585ba11be1b3012f14274f2559289254276613c8477e5133ead5feb4152df6b3bd062b42d7b0c7 WHIRLPOOL 54f785b2766bae3c7df624e1f20984186e27919a093921c053d76dd3225e58c8796a08d9b2ee2f064279a44e2f248243534ca232fc1b3f90791c538d748becf4
-EBUILD imlib2-1.4.5.ebuild 1664 SHA256 f540ec317040e4d1865a6bab548cb76e5c9ed4307fadc2c04b2aec73b77643a3 SHA512 9a627b28782796c793e55eb82168b6058549c9eb771768408baba99f9037911a9498662498f6dab18195df588433f85a80e46d6844f4e88bde62fef88bb06b17 WHIRLPOOL e109db59398d71a4b40f29ce3961b35b6f5461ba2c39f57c2d2709c75b20861a2a0850bee23dbf29ec100c51f86de3076d528d3910d21c31a7411435d0906544
-MISC ChangeLog 13923 SHA256 45f954b5e66020facbff4a0e23a625847fd1033834c4766ff862f0a80e470295 SHA512 aa7c26226526f92cd2715b4aad710b8dcb8a266d5cf4682ce4e164900c53dedb0f7fd722fcb213f5eaa3d20d18b209ca994d7ea2782da6854f5f093105b6fc07 WHIRLPOOL 822234a0e318141200c9a36a6870abf5c1dde372f8202ac8a3ff54b4844bce5f46218ccc605da0888b16e0c9efeaa9f5f5e0c1012b8add4d1eb267937da3c241
-MISC metadata.xml 2234 SHA256 0b9bafdca6d97aa6f505a0029f5bf22e8d55825a9e16e72e5c65ced280cfdbaa SHA512 9f58e1093d6ac06b3e865fa5ec339b3a96483e30ee91b8c98726faa3ade42b63b44f44482e13b85b5333fa7453909ee54f1b72b0051014cbe4fa22b6fb2e86c2 WHIRLPOOL 7640c0a00ce8090d36d2c7c3f7baa9741dc3e91ceb610012685614250a25e169045b9629ba3a2b2d85c86f078c23d23ad549eb871edc368eeebbc791691d39d1
+EBUILD imlib2-1.4.5.ebuild 1640 SHA256 03b38e55f3961c459f288ffb5122f433d5f4542d547630e18653a385f4baef77 SHA512 2219d7617fe0b6c4b196556071f318d527b26f6c5c8a730478d41d4ff42d7f50f7651f64c1badf5b5b7a3d4013cb9c9de59b322c8cc7af2c390b295c0c5bd178 WHIRLPOOL e7f435957a7e4fc030c60f2be972b5c3f3327255c62d8142b4e33a50709666b7491a5702621530cad8aa500b8eb02022cd1a1f2da1df07f476ec4394ffff4548
+EBUILD imlib2-9999.ebuild 1638 SHA256 d7866fd2dfbc16f6c175ef4241a93bcd743ab8677974f1bc17434e69ef991b94 SHA512 af1d51138de619470f7bf8dfe16204b0e7eee56a711b25d79d4e30bf03c436b2bee4506b1596c83dd6cf80e0e2def633a823fdf5045ea18871765b7b30e2c549 WHIRLPOOL e424e2942d72f690d8601e5e6d8ed4c2b5c7e3a7ff2c0a5197e8cfb84316f0ae0a55a76f196dc9d3848fca1a5f8554433401ec6fbc6dbbda9b0cd203a8db9220
+MISC ChangeLog 14180 SHA256 b0ad0a3efddcf474787416bfdce52a0c223692e0da2753c440cb1995b341cb36 SHA512 3b0d56c68d9677c3647ffbb8acda6b1c53082bb79654cb9b33218b5a758fd5a89940e4e8130bbac155c0d6a166712052abfca5a0d1e747dc5a8430b32fa7f1ce WHIRLPOOL 2420a4c943020c2ddb6430d1e24ba78d96b5961eb020bf7cf97b474e006ba36e8d5a337ca7b669e4810851b99732f0a63a98ccff4d968fc4688a73dcab710128
+MISC metadata.xml 2200 SHA256 343b4e61546c7f2a89249bd63c4018975cbc53bd8622d641d27dc05f8aa5235a SHA512 1993bd9088534da0122db66e83017259423f79f4dd9de442f4f4dec6fe4398979813ae83f0a7640630da1f6fcf2b8ab59d64ed5cba09144cd243f232618501f1 WHIRLPOOL bbd8aafa47c63e0b32b888e89a62d321591a2c43ea0b3d816206c62f2a0381de89c554a84479727a281957c8b707175c8b125c47135ccf17d707928cadc51ff8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJSCeY9AAoJEEdUh39IaPFN/SwH/1+Ot4YpcM9Hb85xOOFN/fYv
-Erw5Z0aO1mNCklmNQqqAFtVPPuOuSUJg1xAHFWTmToKd7gnWt5spMuq0zdJ5RfsZ
-m0L+fsjScxdW708JMufwYc5RfL/V59AbwSST3e4ttt8aOry9VwIYW5CpXH3T31Rn
-nWpYPXmi0HYgI00Au56EaJvbutMgmDWhzp8BAn9uv1VAtv7X/PYDsb/frj7Udy8y
-JL1pkyBPqPgrTFGdSdStpH39aH3O2HBb+3KVicbIyM02C3nEpyliRFUWbTlWFr+2
-/GT4JcGQjS0/NWFV7pdm0hhgQGg6j68znFdbO7Aj7kjtmPunDvWNdZ49JsRiNSs=
-=9QP5
+iQIcBAEBCAAGBQJSRqNdAAoJELEHsLL7fEFWlUIP/0NHMZjbK4q+QP0AfdbkOnGW
+OB54vFm0BmxCMHpPkmFi8Hl3HgQ58GKH2Qlt2kKiX/G7+R98LTwS7koWl74aHo8P
+Awu76yKc2WI3VXpHX/h3l74sa/WtM8DLOc77gnSm6j2+ijzlDdxnAYDlCqZjuUMR
+EpWRfSvHNkZwo/GRmWd5FvdoDY4KJ95f026FM+T8qN5c0wtlnu8hEsSC3F2ZUC71
+ay5QUyyIFIofubA+eBVMbZI6SesvyaOAdkGkg18z8qijjVtVTAiU4qDW8CX3gqKy
+Em/X1FCRchtYcD0NQipW0U9X5yqkbs5ZdLZciwqGLKx+Uqm11152SLyW8X2PSr+D
+jA/FKVTciD4iudL+YU0fZyW+Y72QSdyszryCgghYXrgP4JnxLPMb5fUAeF4dffKL
+dEyCCUQ2/9FkNmsNet0JtYESAX+t9th3zVTachGDtLRFUqeIunoWN4aBJmlQxFpl
+3tejC6TLFih4q25OC7lAsWhg0ETba3o9y+0MHaBW0+yYESIDVTKQt01H2aimb4LH
+rcAh81PkbluZgeCEOTbmDzozcZLw8te7jhirI4gGgvyVqeGtgnabwte8ZU86Lr/9
+jikmzgiujcgiQcCLKWPcNS+CVFwswQAEIpsa//1Kbc5KWQb08TuZM+6QWTPobYfa
+J6ZgxJLoS9hRbx2sLQJK
+=/g+j
-----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch b/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch
deleted file mode 100644
index 069538ef657d..000000000000
--- a/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-http://bugs.gentoo.org/354989
-
-# http://sourceforge.net/mailarchive/message.php?msg_id=26972342
-
-$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $
-
-Fix build with png-1.5.
-
-has also been committed upstream.
-
---- src/modules/loaders/loader_png.c
-+++ src/modules/loaders/loader_png.c
-@@ -58,7 +58,7 @@
- fclose(f);
- return 0;
- }
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- fclose(f);
-@@ -238,7 +238,7 @@
- png_structp png_ptr;
- png_infop info_ptr;
- DATA32 *ptr;
-- int x, y, j;
-+ int x, y, j, interlace;
- png_bytep row_ptr, data = NULL;
- png_color_8 sig_bit;
- int pl = 0;
-@@ -265,7 +265,7 @@
- png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- return 0;
- }
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- fclose(f);
- png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
-@@ -274,11 +274,11 @@
- }
-
- /* check whether we should use interlacing */
-+ interlace = PNG_INTERLACE_NONE;
- if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val)
- {
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
-- png_ptr->interlaced = PNG_INTERLACE_ADAM7;
-- num_passes = png_set_interlace_handling(png_ptr);
-+ interlace = PNG_INTERLACE_ADAM7;
- #endif
- }
-
-@@ -286,7 +286,7 @@
- if (im->flags & F_HAS_ALPHA)
- {
- png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8,
-- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
-+ PNG_COLOR_TYPE_RGB_ALPHA, interlace,
- PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- #ifdef WORDS_BIGENDIAN
- png_set_swap_alpha(png_ptr);
-@@ -297,7 +297,7 @@
- else
- {
- png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB,
-- png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE,
-+ interlace, PNG_COMPRESSION_TYPE_BASE,
- PNG_FILTER_TYPE_BASE);
- data = malloc(im->w * 3 * sizeof(char));
- }
-@@ -344,6 +344,10 @@
- png_set_shift(png_ptr, &sig_bit);
- png_set_packing(png_ptr);
-
-+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-+ num_passes = png_set_interlace_handling(png_ptr);
-+#endif
-+
- for (pass = 0; pass < num_passes; pass++)
- {
- ptr = im->data;
diff --git a/media-libs/imlib2/imlib2-1.4.4.ebuild b/media-libs/imlib2/imlib2-1.4.4.ebuild
deleted file mode 100644
index 25a2ab4405ea..000000000000
--- a/media-libs/imlib2/imlib2-1.4.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.4.ebuild,v 1.13 2013/08/13 07:56:56 ssuominen Exp $
-
-EAPI="2"
-
-inherit enlightenment toolchain-funcs
-
-MY_P=${P/_/-}
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X bzip2 gif jpeg mmx mp3 png tiff 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-1.4:0 )
- jpeg? ( virtual/jpeg:0 )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- X? ( x11-libs/libXext x11-proto/xextproto )
- mp3? ( media-libs/libid3tag )"
-DEPEND="${RDEPEND}
- png? ( virtual/pkgconfig )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libpng-1.5.patch #354989
-}
-
-src_configure() {
- # imlib2 has diff configure options for x86/amd64 mmx
- local myconf=""
- if [[ $(tc-arch) == "amd64" ]] ; then
- myconf="$(use_enable mmx amd64) --disable-mmx"
- else
- myconf="--disable-amd64 $(use_enable mmx)"
- fi
-
- [[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
-
- export MY_ECONF="
- $(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) \
- ${myconf} \
- "
- enlightenment_src_configure
-}
diff --git a/media-libs/imlib2/imlib2-1.4.5.ebuild b/media-libs/imlib2/imlib2-1.4.5.ebuild
index 83ab5a8738ba..b5b92ab7a985 100644
--- a/media-libs/imlib2/imlib2-1.4.5.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.5.ebuild
@@ -1,15 +1,22 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v 1.10 2013/08/13 07:56:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v 1.11 2013/09/28 09:37:31 vapier Exp $
+
+EAPI="4"
+
+EGIT_SUB_PROJECT="legacy"
+EGIT_URI_APPEND=${PN}
+
+if [[ ${PV} != "9999" ]] ; then
+ EKEY_STATE="release"
+fi
-EAPI=4
inherit enlightenment toolchain-funcs
DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
HOMEPAGE="http://www.enlightenment.org/"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="X bzip2 gif jpeg mmx mp3 png static-libs tiff zlib"
+IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
RDEPEND="=media-libs/freetype-2*
bzip2? ( app-arch/bzip2 )
@@ -21,27 +28,26 @@ RDEPEND="=media-libs/freetype-2*
X? (
x11-libs/libX11
x11-libs/libXext
- )
+ )
mp3? ( media-libs/libid3tag )"
DEPEND="${RDEPEND}
png? ( virtual/pkgconfig )
X? (
x11-proto/xextproto
x11-proto/xproto
- )"
+ )"
src_configure() {
# imlib2 has diff configure options for x86/amd64 mmx
- local myconf
if [[ $(tc-arch) == amd64 ]]; then
- myconf="$(use_enable mmx amd64) --disable-mmx"
+ E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
else
- myconf="--disable-amd64 $(use_enable mmx)"
+ E_ECONF+=( --disable-amd64 $(use_enable mmx) )
fi
- [[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
+ [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
- export MY_ECONF="
+ E_ECONF+=(
$(use_enable static-libs static)
$(use_with X x)
$(use_with jpeg)
@@ -51,8 +57,7 @@ src_configure() {
$(use_with zlib)
$(use_with bzip2)
$(use_with mp3 id3)
- ${myconf}
- "
+ )
enlightenment_src_configure
}
@@ -61,5 +66,5 @@ src_install() {
enlightenment_src_install
# enlightenment_src_install should take care of this for us, but it doesn't
- find "${ED}" -name '*.la' -exec rm -f {} +
+ find "${ED}" -name '*.la' -delete
}
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
new file mode 100644
index 000000000000..4434dd7317d6
--- /dev/null
+++ b/media-libs/imlib2/imlib2-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 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 $
+
+EAPI="4"
+
+EGIT_SUB_PROJECT="legacy"
+EGIT_URI_APPEND=${PN}
+
+if [[ ${PV} != "9999" ]] ; then
+ EKEY_STATE="stable"
+fi
+
+inherit enlightenment toolchain-funcs
+
+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 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
+ mp3? ( media-libs/libid3tag )"
+DEPEND="${RDEPEND}
+ png? ( virtual/pkgconfig )
+ X? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+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 )
+
+ 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
+}
+
+src_install() {
+ enlightenment_src_install
+
+ # enlightenment_src_install should take care of this for us, but it doesn't
+ find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index d4d2cbb6fb49..0bf556b63f44 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>vapier@gentoo.org</email>
-</maintainer>
+<herd>enlightenment</herd>
<longdescription>
Imlib 2 is the successor to Imlib. It is not just a newer version - it is a
completely new library. Imlib2 can be installed alongside Imlib 1.x without any