Fix virtual/libintl and virtual/libiconv dependencies, add patch to link against libintl when the libc doesn't provide the iconv functions. Add ~x86-fbsd keyword.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 45 insertions, 14 deletions

diff --git a/x11-wm/enlightenment/ChangeLog b/x11-wm/enlightenment/ChangeLog
index edb15229ecf5..7590bb44a51e 100644
--- a/x11-wm/enlightenment/ChangeLog
+++ b/x11-wm/enlightenment/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/enlightenment
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.43 2006/03/31 03:22:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.44 2006/04/14 18:42:06 flameeyes Exp $
+
+  14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/e16-0.16.8.1-iconv.patch, enlightenment-0.16.8.1.ebuild:
+  Fix virtual/libintl and virtual/libiconv dependencies, add patch to link
+  against libintl when the libc doesn't provide the iconv functions. Add
+  ~x86-fbsd keyword.
 
 *enlightenment-0.16.8.1 (31 Mar 2006)
 
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index dde04b2c87b7..3b1b1496b87e 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ccbbdd6199746def8b8aada918c3e619 ChangeLog 6263
-RMD160 875b6af46391bd7c963481e7455a00e953ebd416 ChangeLog 6263
-SHA256 2b716de49e2e077809276810a2d1d9700225c2e914f0855c1e3e61bc0c5ea5d3 ChangeLog 6263
+MD5 0d78ab8271c005f10552ea07dea2de46 ChangeLog 6555
+RMD160 a008ed9e2a4f21ca9bb852af34b61b0550ecb5af ChangeLog 6555
+SHA256 fc579a815eecbaa32482390205bc0c29794e1b5531b17a0665a2efd99fdb839c ChangeLog 6555
 MD5 e58a523f218b83377e26940d3b59d4c7 enlightenment-0.16.5-r4.ebuild 1602
 RMD160 021194107588f6e710c860becd912487ef8ea720 enlightenment-0.16.5-r4.ebuild 1602
 SHA256 5e461f361fd2f46a4b798b984b0a388beece98aa4cd726bfd889d09ac987707e enlightenment-0.16.5-r4.ebuild 1602
@@ -13,9 +13,9 @@ SHA256 8bd7bd6458ae90b7bc04c862c2a828eecb39f58e25cc0748bbd96486a82cd375 enlighte
 MD5 aa422efda2e5a2af1eb66c9182d99bca enlightenment-0.16.7.2.ebuild 1565
 RMD160 a5dfd3e6f61b2009142f1538428a7bd1fe54ba5f enlightenment-0.16.7.2.ebuild 1565
 SHA256 18356497753fba717f291320e0f3c93832afd404b13e0647cce299cf0a7a83e5 enlightenment-0.16.7.2.ebuild 1565
-MD5 8250887f4dd789055062444ae5e8c436 enlightenment-0.16.8.1.ebuild 1552
-RMD160 496c0e32f3e3b0ace6aae0286b0141d2f2ccd5c2 enlightenment-0.16.8.1.ebuild 1552
-SHA256 c6932f79b3ff5f32ed1b41702b39aac7f5f372f0cda134ac34eb0ba426f2081b enlightenment-0.16.8.1.ebuild 1552
+MD5 e86661e9258a910d0480d428bab6ada9 enlightenment-0.16.8.1.ebuild 1717
+RMD160 b49ea8676f7e32c7d0013835e0e0e16a790ed47a enlightenment-0.16.8.1.ebuild 1717
+SHA256 bcec5fbcd5d90807df76871b168479fd4daf3cf6b549771ca8e0e5efbb651ee4 enlightenment-0.16.8.1.ebuild 1717
 MD5 5a6f21d242b6552c78a1173c13c47659 enlightenment-0.16.8.ebuild 1537
 RMD160 8423c6574a523573340257aaa540a4878389c65c enlightenment-0.16.8.ebuild 1537
 SHA256 7c161756dd6cb835262b396f49729dd1203e1495f2a5b6fe7d769a7529273250 enlightenment-0.16.8.ebuild 1537
@@ -52,6 +52,9 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 928bc2e57ec01e756fec93a3ed1cb8a2 files/e16 28
 RMD160 4b9aaa7fb1a582089433d9a5321924419fcce2a3 files/e16 28
 SHA256 794c333b669cf416c05b7cfad8e56a2d917c39817322253812256e86ebaeb70e files/e16 28
+MD5 2e14c79f2284cb1d569125ef6a2e32c3 files/e16-0.16.8.1-iconv.patch 332
+RMD160 7c38478c8b4e703eeff956a6c928eff6439ade37 files/e16-0.16.8.1-iconv.patch 332
+SHA256 c6e8fbf637e94addfcfb6b9d9926a5381bd2f3eef2a76fa4355b351b19b2b2e1 files/e16-0.16.8.1-iconv.patch 332
 MD5 943d1947d4bd7b7ee6387ba5827166a4 files/enlightenment 33
 RMD160 eff0ce60358e25f267706705a09d1a78a3f5bf31 files/enlightenment 33
 SHA256 6dc01a6df37a4ed9adf0fbd913c403a23cbeae68b8ab4efb2b88b99c6e8c2ccb files/enlightenment 33
@@ -64,7 +67,7 @@ SHA256 4158c36c21f31afedd523dde98f60a2393c208f142df806e837e21c871dd7fe4 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEPGFK2+ySkm8kpY0RAkdEAJ9yWLV/b+Q13H3pYmAAVULiDEjSfACfZ3N6
-NgJHc0huEl3iy7ZXM9lLCfk=
-=0gVG
+iD8DBQFEP+0OAiZjviIA2XgRAtZbAJ4rvQ1r9z/gjy8Wy0we3Qvn8V3IUQCfXf/6
+mqJQB3wboBQToDXzUWpvVOM=
+=zQwR
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/enlightenment/enlightenment-0.16.8.1.ebuild b/x11-wm/enlightenment/enlightenment-0.16.8.1.ebuild
index 0a172445e115..4f0ac984846a 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.8.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.8.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.8.1.ebuild,v 1.1 2006/03/31 03:22:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.8.1.ebuild,v 1.2 2006/04/14 18:42:06 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Enlightenment Window Manager"
 HOMEPAGE="http://www.enlightenment.org/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="esd nls xinerama xrandr doc"
 
 RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
@@ -31,13 +31,23 @@ RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
 		x11-proto/xf86vidmodeproto
 		xinerama? ( x11-libs/libXinerama x11-proto/xineramaproto )
 		x11-proto/xproto
-		) virtual/x11 )"
+		) virtual/x11 )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( app-doc/edox-data )"
 
 S=${WORKDIR}/e16-${PV/_pre?}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/e16-${PV}-iconv.patch"
+	eautomake
+}
+
 src_compile() {
 	econf \
 		$(use_enable nls) \
diff --git a/x11-wm/enlightenment/files/e16-0.16.8.1-iconv.patch b/x11-wm/enlightenment/files/e16-0.16.8.1-iconv.patch
new file mode 100644
index 000000000000..5b6eb045c4a0
--- /dev/null
+++ b/x11-wm/enlightenment/files/e16-0.16.8.1-iconv.patch
@@ -0,0 +1,12 @@
+Index: e16-0.16.8.1/src/Makefile.am
+===================================================================
+--- e16-0.16.8.1.orig/src/Makefile.am
++++ e16-0.16.8.1/src/Makefile.am
+@@ -123,6 +123,7 @@ e16_SOURCES = \
+ LDADD = \
+ 	@LIBINTL@		\
+ 	@ecore_libs@		\
++	$(LTLIBICONV)		\
+ 	$(ESD_LIBS) 		\
+ 	$(IMLIB_LIBS) 		\
+ 	$(X_PRE_LIBS) 		\