Fix building with USE=-nls and add support for SuperH.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 57 insertions, 19 deletions

diff --git a/x11-wm/enlightenment/ChangeLog b/x11-wm/enlightenment/ChangeLog
index c354007e9791..275b307ebee2 100644
--- a/x11-wm/enlightenment/ChangeLog
+++ b/x11-wm/enlightenment/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/enlightenment
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.39 2005/03/30 16:46:50 hansmi Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.40 2006/01/07 07:28:45 vapier Exp $
+
+  07 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/enlightenment-0.16.7.2-no-nls.patch, enlightenment-0.16.6.ebuild,
+  enlightenment-0.16.7.2.ebuild, enlightenment-0.16.9999.ebuild:
+  Fix building with USE=-nls and add support for SuperH.
 
   30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
   enlightenment-0.16.7.2.ebuild:
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 032193794a81..8f9e580ec245 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 01f03287317f38152e719341daf701bf ChangeLog 5629
+MD5 f7cf846af84245ed7108404227f488c7 ChangeLog 5877
 MD5 e58a523f218b83377e26940d3b59d4c7 enlightenment-0.16.5-r4.ebuild 1602
-MD5 242498d15c9802751483069071de9743 enlightenment-0.16.6.ebuild 1850
-MD5 7774718467ad2029d12b611ecb1860ee enlightenment-0.16.7.2.ebuild 1460
-MD5 bcbe682de1218f677021b43c86046049 enlightenment-0.16.9999.ebuild 1824
+MD5 58272e98cbbb3629a3a94780fe2671bd enlightenment-0.16.6.ebuild 1854
+MD5 aa422efda2e5a2af1eb66c9182d99bca enlightenment-0.16.7.2.ebuild 1565
+MD5 dcac0308f1ff9de17bdd88a4291ed791 enlightenment-0.16.9999.ebuild 1829
 MD5 fbe59612181a2fb8c213b815a2f45ebd files/0.16.6-edox.patch 2775
 MD5 c0e73afcafa0fbb90610eef266a75c82 files/0.16.6-kde-menu.patch 454
 MD5 de50be73f3493d4787a6533b08077d06 files/cursors.cfg 686
@@ -14,11 +14,12 @@ MD5 24c537c993ea9c463f993b24a872183c files/digest-enlightenment-0.16.6 74
 MD5 01290d54c8d28735c2fe344796bfa7ba files/digest-enlightenment-0.16.7.2 75
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-enlightenment-0.16.9999 0
 MD5 943d1947d4bd7b7ee6387ba5827166a4 files/enlightenment 33
+MD5 3ad2dae193789dec0097cd6675a150ab files/enlightenment-0.16.7.2-no-nls.patch 469
 MD5 7ed1cbab645402fbf7666ed95588542d metadata.xml 1572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDifQbgIKl8Uu19MoRAs8SAJ9AvwUo884MdRGvblig6Kbuz5qaHQCfYwOx
-qAvbMsK0dya23YoS+bb/LGQ=
-=wr0i
+iD8DBQFDv2322+ySkm8kpY0RAi1eAKCevlATuMDylArUJ5qVtPoMmGSB1QCgmWlM
+hhavqJ0sLxCKQIuVx5lrvic=
+=8NKv
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/enlightenment/enlightenment-0.16.6.ebuild b/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
index 19cea93e6cd1..3f0e23cc46be 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.6.ebuild,v 1.14 2005/02/09 00:20:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.6.ebuild,v 1.15 2006/01/07 07:28:45 vapier Exp $
 
 inherit eutils
 
@@ -50,7 +50,7 @@ src_compile() {
 
 src_install() {
 	export USER=root
-	emake install DESTDIR=${D} || die
+	emake -j1 install DESTDIR=${D} || die
 	mv ${D}/usr/bin/{,e}dox
 	exeinto /etc/X11/Sessions
 	doexe ${FILESDIR}/enlightenment
diff --git a/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild b/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild
index 026b3c1f7f30..032693a9ad37 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.7.2.ebuild,v 1.8 2005/11/27 17:45:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild,v 1.9 2006/01/07 07:28:45 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Enlightenment Window Manager"
 HOMEPAGE="http://www.enlightenment.org/"
@@ -8,7 +10,7 @@ SRC_URI="mirror://sourceforge/enlightenment/enlightenment-${PV/_/-}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="doc esd nls nothemes xinerama xrandr"
 
 RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
@@ -36,6 +38,12 @@ PDEPEND="!nothemes? ( x11-themes/ethemes )
 
 S=${WORKDIR}/${PN}-${PV/_pre?}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-nls.patch
+}
+
 src_compile() {
 	econf \
 		$(use_enable nls) \
@@ -49,7 +57,7 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake -j1 install DESTDIR="${D}" || die
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}"/enlightenment
 	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README*
diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
index 93738b144442..a2cd05b5889a 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.9999.ebuild,v 1.14 2005/11/27 17:57:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild,v 1.15 2006/01/07 07:28:45 vapier Exp $
 
 ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
 ECVS_MODULE="e16/e"
@@ -60,7 +60,7 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	emake -j1 install DESTDIR="${D}" || die
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}"/enlightenment
 
diff --git a/x11-wm/enlightenment/files/enlightenment-0.16.7.2-no-nls.patch b/x11-wm/enlightenment/files/enlightenment-0.16.7.2-no-nls.patch
new file mode 100644
index 000000000000..555e47767aa5
--- /dev/null
+++ b/x11-wm/enlightenment/files/enlightenment-0.16.7.2-no-nls.patch
@@ -0,0 +1,24 @@
+--- src/E.h
++++ src/E.h
+@@ -190,6 +190,7 @@
+ #include <locale.h>
+ #endif
+ 
++#ifdef ENABLE_NLS
+ #include <libintl.h>
+ #define _(String) gettext(String)
+ #ifdef gettext_noop
+@@ -197,6 +198,13 @@
+ #else
+ #define N_(String) (String)
+ #endif
++#else
++# define _(String) (String)
++# define N_(String) (String)
++# define bindtextdomain(pkg,locale)
++# define textdomain(pkg)
++# define bind_textdomain_codeset(pkg,enc)
++#endif
+ 
+ #ifndef MAX
+ #define MAX(a,b)  ((a)>(b)?(a):(b))