Bump from GNUstep overlay. Using new gnustep eclasses

(Portage version: 2.1.2.11)

7 files changed, 34 insertions, 98 deletions

diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
index 64a68b31d26b..44ae7db31fe0 100644
--- a/gnustep-base/gnustep-back-xlib/ChangeLog
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-back-xlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.22 2007/07/22 10:24:19 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.23 2007/08/18 15:09:40 grobian Exp $
+
+*gnustep-back-xlib-0.12.0 (18 Aug 2007)
+
+  18 Aug 2007; Fabian Groffen <grobian@gentoo.org>
+  -files/font-make-fix.patch-0.9.5, -gnustep-back-xlib-0.9.5.ebuild,
+  -gnustep-back-xlib-0.9.6.ebuild, +gnustep-back-xlib-0.12.0.ebuild:
+  Bump from GNUstep overlay.  Using new gnustep eclasses
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   gnustep-back-xlib-0.10.3.ebuild:
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.12.0 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.12.0
new file mode 100644
index 000000000000..32c09112f846
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.12.0
@@ -0,0 +1,3 @@
+MD5 1b0252a1b645dd2ca4c78427fb885f1f gnustep-back-0.12.0.tar.gz 853996
+RMD160 ad19420127bb0e2e5f7dc9c3cf9974ea06255565 gnustep-back-0.12.0.tar.gz 853996
+SHA256 59b000aa069e2a50398b31296ce5d663f98fc8d131bfd8f3d10e29b0a5379a45 gnustep-back-0.12.0.tar.gz 853996
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5
deleted file mode 100644
index 6743b526cb9f..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65793b1026b2a06198b8438718309deb gnustep-back-0.9.5.tar.gz 820026
-RMD160 833124355c2864d2e75e71baff5dcbbaf177f1c2 gnustep-back-0.9.5.tar.gz 820026
-SHA256 cd4399ccbab13f7425f97af6015900164fa5454c89464d15c3a66719c5a9823a gnustep-back-0.9.5.tar.gz 820026
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.6 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.6
deleted file mode 100644
index ecdc442a9cb6..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 553cdbeebc66fdb53124fc91ea312f2c gnustep-back-0.9.6.tar.gz 820228
-RMD160 3677f4e8d36b76a04114ce34ed9abb2779307893 gnustep-back-0.9.6.tar.gz 820228
-SHA256 1079b34944b7948f68dc0a04d38c30fa94b7ed2b3e8ae4d61bef74b4034c3b22 gnustep-back-0.9.6.tar.gz 820228
diff --git a/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5 b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5
deleted file mode 100644
index ce66c0c0c82d..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur gnustep-back-0.9.5/Fonts/GNUmakefile gnustep-back-0.9.5-test/Fonts/GNUmakefile
---- gnustep-back-0.9.5/Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
-+++ gnustep-back-0.9.5-test/Fonts/GNUmakefile	2005-04-09 14:27:01.000000000 -0400
-@@ -21,7 +21,7 @@
- #  License along with this library; if not, write to the Free
- #  Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
- 
--GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
-+#GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
- 
- GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make
- include $(GNUSTEP_MAKEFILES)/common.make
-@@ -36,5 +36,5 @@
- 
- include $(GNUSTEP_MAKEFILES)/rules.make
- 
---include GNUmakefile.postamble
-+#-include GNUmakefile.postamble
- 
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.12.0.ebuild
index 41232820f3e7..15aac7e7b501 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.12.0.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5.ebuild,v 1.4 2007/07/12 16:11:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.12.0.ebuild,v 1.1 2007/08/18 15:09:40 grobian Exp $
 
-inherit gnustep
+inherit gnustep-base
 
 S=${WORKDIR}/gnustep-back-${PV}
 
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
+DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
 
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-PROVIDE="virtual/gnustep-back"
-
 IUSE="opengl xim"
 DEPEND="${GNUSTEP_CORE_DEPEND}
-	~gnustep-base/gnustep-make-1.10.0
-	~gnustep-base/gnustep-base-1.10.3
-	~gnustep-base/gnustep-gui-0.9.5
-	virtual/xft
-	opengl? ( virtual/opengl virtual/glu )"
-RDEPEND="${DEPEND}
-	${DEBUG_DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
-}
+	~gnustep-base/gnustep-gui-${PV}
+	opengl? ( virtual/opengl virtual/glu )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXft
+	x11-libs/libXrender
+	dev-libs/expat
+	media-libs/fontconfig
+	>=media-libs/freetype-2.1.9
+	!gnustep-base/gnustep-back-art
+	!gnustep-base/gnustep-back-cairo"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	egnustep_env
@@ -41,7 +40,7 @@ src_compile() {
 	use opengl && myconf="--enable-glx"
 	myconf="$myconf `use_enable xim`"
 	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib --with-name=xlib"
+	myconf="$myconf --enable-graphics=xlib"
 	econf $myconf || die "configure failed"
 
 	egnustep_make
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.6.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.6.ebuild
deleted file mode 100644
index e8532b1753cf..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.6.ebuild,v 1.3 2007/07/12 16:11:17 mr_bones_ Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="opengl xim"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	~gnustep-base/gnustep-make-1.10.0
-	~gnustep-base/gnustep-base-1.10.3
-	~gnustep-base/gnustep-gui-0.9.5
-	virtual/xft
-	opengl? ( virtual/opengl virtual/glu )"
-RDEPEND="${DEPEND}
-	${DEBUG_DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-0.9.5
-}
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib --with-name=xlib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}