Removing ald and masked files, bumping version, ported to modular X.

(Portage version: 2.1_pre6-r5)

10 files changed, 138 insertions, 121 deletions

diff --git a/gnustep-base/gnustep-back-art/ChangeLog b/gnustep-base/gnustep-back-art/ChangeLog
index 4a4a15033f58..22f76725b78a 100644
--- a/gnustep-base/gnustep-back-art/ChangeLog
+++ b/gnustep-base/gnustep-back-art/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-base/gnustep-back-art
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.33 2006/01/29 15:47:02 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.34 2006/03/25 15:28:02 grobian Exp $
+
+*gnustep-back-art-0.10.3 (25 Mar 2006)
+
+  25 Mar 2006; Fabian Groffen <grobian@gentoo.org>
+  -files/font-make-fix.patch-0.9.5_pre20050312,
+  +files/font-make-fix.patch-0.10.3, -gnustep-back-art-0.9.4-r1.ebuild,
+  -gnustep-back-art-0.9.5_pre20050312.ebuild,
+  +gnustep-back-art-0.10.3.ebuild:
+  Removing ald and masked files, bumping version, ported to modular X.
 
   28 Jan 2006; Simon Stelling <blubb@gentoo.org>
   -files/gnustep-back-art-0.9.4-ft219-backport.patch.bz2,
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
index 2c7b70ea350f..05419111b6b8 100644
--- a/gnustep-base/gnustep-back-art/Manifest
+++ b/gnustep-base/gnustep-back-art/Manifest
@@ -1,15 +1,39 @@
 MD5 7566028d693fbcf4096913e9cb98c7f1 ChangeLog 6426
+RMD160 5dd35f8271421b03948bc9fb062fa0a207a90416 ChangeLog 6426
+SHA256 04d4e653d3b33b9ba6b762cf90d44794c9b5c01aeb8a50ec987969f77b821240 ChangeLog 6426
 MD5 7421c230db078e850be063b28fdf18cf files/config-gnustep-back-art.sh 415
-MD5 87584917cd53a0073a1879c52d463e9d files/digest-gnustep-back-art-0.9.4-r1 161
+RMD160 fd675d506dafa7d84f7999f26c5f1159fd6b12ca files/config-gnustep-back-art.sh 415
+SHA256 dcd1f2d22bcdc96ee9d1f65719ff87d41382a8287853a49d7c8090c75a060f5f files/config-gnustep-back-art.sh 415
+MD5 582a16a1582efe47a9e23cb9dc269556 files/digest-gnustep-back-art-0.10.3 259
+RMD160 b83787add083beda399da222775f946cca8081f9 files/digest-gnustep-back-art-0.10.3 259
+SHA256 aa9fa1dae32ce5b0f9599cf2b89534575e5d6dece4741962ad1d7a39269e9c16 files/digest-gnustep-back-art-0.10.3 259
 MD5 886a210bb5db57775f15aa3261c8e632 files/digest-gnustep-back-art-0.9.5 70
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-art-0.9.5_pre20050312 0
+RMD160 894f4f9f353299e25504df6e55d94e139e608381 files/digest-gnustep-back-art-0.9.5 70
+SHA256 4bd3a758264791192ad1129eae6760c3a140b36e04c695082f7aa24e4db7f49e files/digest-gnustep-back-art-0.9.5 70
 MD5 7973182788a4d8c751e2516cf8733ba6 files/digest-gnustep-back-art-0.9.6 70
+RMD160 8294229fd9745a19b57ed784c88c4ac050154ebe files/digest-gnustep-back-art-0.9.6 70
+SHA256 2369387b9012928198daa88820223ce1d5de8174cbd0892fe7d93a4e16c602c5 files/digest-gnustep-back-art-0.9.6 70
 MD5 7973182788a4d8c751e2516cf8733ba6 files/digest-gnustep-back-art-0.9.6-r1 70
+RMD160 8294229fd9745a19b57ed784c88c4ac050154ebe files/digest-gnustep-back-art-0.9.6-r1 70
+SHA256 2369387b9012928198daa88820223ce1d5de8174cbd0892fe7d93a4e16c602c5 files/digest-gnustep-back-art-0.9.6-r1 70
+MD5 44ed3a91370309c8cd7c2463392fec1e files/font-make-fix.patch-0.10.3 384
+RMD160 2bdf5cfab58f275976964411faff660e1260a7ab files/font-make-fix.patch-0.10.3 384
+SHA256 e85101e000f2ea78077acc9aaf55dc4a4849937dd7596e25620b5524f069782d files/font-make-fix.patch-0.10.3 384
 MD5 e80f67b11659da59c1aeb0d995a8cf4c files/font-make-fix.patch-0.9.5 737
-MD5 f9dd4c1b68af4bef2e272d82202323ea files/font-make-fix.patch-0.9.5_pre20050312 501
-MD5 8687ae86a211f9fb7ed495c618bac533 gnustep-back-art-0.9.4-r1.ebuild 1291
+RMD160 720ef4e5c77fc53a555b40c78620ea8c28b2f188 files/font-make-fix.patch-0.9.5 737
+SHA256 cab84c89d2cb0416ed17f1737faf425f5c1c356454bd6e5b5417c471a0ae9255 files/font-make-fix.patch-0.9.5 737
+MD5 a5208a3a72efa3cc3d910a7649b130f1 gnustep-back-art-0.10.3.ebuild 2472
+RMD160 89e5f2b26583614c30a4ff451b5e48dac268281e gnustep-back-art-0.10.3.ebuild 2472
+SHA256 9aac6415d17f14bfee6d2be84dcf54de4b664eb40b5df47dc5b4feb37e72976c gnustep-back-art-0.10.3.ebuild 2472
 MD5 1b8c99652b3d4ba9c8a52efe06240575 gnustep-back-art-0.9.5.ebuild 1521
-MD5 d38f51c70add9c9b83fa08da0f1a69c4 gnustep-back-art-0.9.5_pre20050312.ebuild 1484
+RMD160 1f0b465dbf810ccf46768b63ae0d9fdc257e253a gnustep-back-art-0.9.5.ebuild 1521
+SHA256 7137ea6e1ea5ded0a39edcb37c7bfe8e6d47e9e9afc7615366fcd52be8636c45 gnustep-back-art-0.9.5.ebuild 1521
 MD5 6c6a04c880a9eca4934a1976ef83e987 gnustep-back-art-0.9.6-r1.ebuild 1552
+RMD160 ef40957831b520bb120c11c9d86a0186520349ae gnustep-back-art-0.9.6-r1.ebuild 1552
+SHA256 82a3ac1127247d4602d5a38851b87b9d70281fb7c4913a5ef15b5357a71380ab gnustep-back-art-0.9.6-r1.ebuild 1552
 MD5 eb668dd58da2dc8a5edf8de61a255207 gnustep-back-art-0.9.6.ebuild 1528
+RMD160 b0c60ac225b70a5aa4af161ce68262121c787ddc gnustep-back-art-0.9.6.ebuild 1528
+SHA256 f653c41894afab0a2c67338ab7f66adc140e2a8370cd944fc13b7c855f80ee0d gnustep-back-art-0.9.6.ebuild 1528
 MD5 e2bc2a5b2bdec3808102e5a2caf41f7f metadata.xml 1030
+RMD160 96446c9b908e06aacce3b93a26117f7ff770e1da metadata.xml 1030
+SHA256 4460a15f6e1831906348e0bdb6f0853fb286384f110da52874f6ae7d597236df metadata.xml 1030
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.10.3 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.10.3
new file mode 100644
index 000000000000..531abf13241b
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.10.3
@@ -0,0 +1,3 @@
+MD5 410e1a84774ac7f49472b0001c10cf7e gnustep-back-0.10.3.tar.gz 841262
+RMD160 e14f1ac12621efe8ffffa55fded2419dc9372966 gnustep-back-0.10.3.tar.gz 841262
+SHA256 b49c7bdbbda3c706e2af021ae2aa60cc7607af27753b66df760084edda76a811 gnustep-back-0.10.3.tar.gz 841262
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.4-r1 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.4-r1
deleted file mode 100644
index a6bc01c4af74..000000000000
--- a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9bbd37749e8bdd355533bdf5d1d08050 gnustep-back-0.9.4.tar.gz 401182
-MD5 1a11b68ef3b40eefd6f0d2ae207a80c1 gnustep-back-art-0.9.4-ft219-backport.patch.bz2 19263
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050312 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050312
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050312
+++ /dev/null
diff --git a/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5_pre20050312 b/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.10.3
index 5554a8b712a7..1406378c5f1c 100644
--- a/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5_pre20050312
+++ b/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.10.3
@@ -1,6 +1,5 @@
-diff -ur Fonts/GNUmakefile Fonts/GNUmakefile
---- Fonts/GNUmakefile	2005-03-12 23:06:51.808553304 -0500
-+++ Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
+--- Fonts/GNUmakefile
++++ Fonts/GNUmakefile
 @@ -27,7 +27,7 @@
  include $(GNUSTEP_MAKEFILES)/common.make
  
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.10.3.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.10.3.ebuild
new file mode 100644
index 000000000000..d250625525a6
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.10.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.10.3.ebuild,v 1.1 2006/03/25 15:28:02 grobian Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/gnustep-back-${PV}
+
+DESCRIPTION="libart_lgpl 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="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+PROVIDE="virtual/gnustep-back"
+
+IUSE="opengl xim doc"
+# from http://gnustep.made-it.com/BuildGuide/index.html#BUILDING.GNUSTEP
+# gnustep-gui, libICE, libSM, libX11, libXext, libXi, libXmu, libXt,
+# libGL, libXft, libXrender, libexpat, libfontconfig, libfreetype,
+# libart
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=gnustep-base/gnustep-make-1.10
+	>=gnustep-base/gnustep-base-1.10
+	~gnustep-base/gnustep-gui-0.10.3
+	gnustep-libs/artresources
+	>=gnustep-base/mknfonts-0.5
+	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
+		)
+		virtual/x11
+	)
+	dev-libs/expat
+	media-libs/fontconfig
+	>=media-libs/freetype-2.1.9
+	>=media-libs/libart_lgpl-2.3
+	!virtual/gnustep-back"
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}
+	media-fonts/dejavu"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_OPTS="-d ${S}" epatch "${FILESDIR}/font-make-fix.patch-${PV}"
+
+	# DejaVu font is successor of Bitstream Vera
+	sed -i -e "s:BitstreamVeraSans-Roman:DejaVuSans:g" \
+		-e "s:BitstreamVeraSansMono-Roman:DejaVuSansMono:g" \
+		-e "s:BitstreamVeraSans-Bold:DejaVuSans-Bold:g" \
+		"${S}/Source/art/ftfont.m"
+}
+
+src_compile() {
+	egnustep_env
+
+	use opengl && myconf="--enable-glx"
+	myconf="$myconf `use_enable xim`"
+	myconf="$myconf --enable-server=x11"
+	myconf="$myconf --enable-graphics=art --with-name=art"
+	econf $myconf || die "configure failed"
+
+	egnustep_make
+}
+
+src_install() {
+	gnustep_src_install
+	cd ${S}
+	egnustep_env
+	mkdir -p "${D}/$(egnustep_system_root)/Library/Fonts"
+	cp -pPR Fonts/Helvetica.nfont "${D}/$(egnustep_system_root)/Library/Fonts"
+	rm -rf "${D}/$(egnustep_system_root)/var"
+	dosym \
+		"$(egnustep_system_root)/Library/Bundles/libgnustep-art-010.bundle" \
+		"$(egnustep_system_root)/Library/Bundles/libgnustep-art.bundle"
+}
+
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4-r1.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4-r1.ebuild
deleted file mode 100644
index 976f17d26a55..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4-r1.ebuild,v 1.6 2006/01/29 15:47:02 blubb Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-DESCRIPTION="libart_lgpl 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
-		mirror://gentoo/${P}-ft219-backport.patch.bz2"
-KEYWORDS="ppc x86 amd64 sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="opengl xim doc"
-DEPEND="${GNUSTEP_GUI_DEPEND}
-	~gnustep-base/gnustep-gui-0.9.4
-	virtual/xft
-	~media-libs/freetype-2.1.9
-	opengl? ( virtual/opengl virtual/glu )
-	gnustep-libs/artresources
-	>=gnustep-base/mknfonts-0.5
-	>=media-libs/libart_lgpl-2.3"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-ft219-backport.patch
-}
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art --with-name=art"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050312.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050312.ebuild
deleted file mode 100644
index 0c0b1f624eca..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050312.ebuild
+++ /dev/null
@@ -1,57 +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-art/gnustep-back-art-0.9.5_pre20050312.ebuild,v 1.4 2005/07/16 19:23:26 swegener Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/back"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="opengl xim doc"
-DEPEND="${GNUSTEP_GUI_DEPEND}
-	virtual/xft
-	>=media-libs/freetype-2.1.9
-	=gnustep-base/gnustep-gui-${PV}*
-	opengl? ( virtual/opengl virtual/glu )
-	gnustep-libs/artresources
-	>=gnustep-base/mknfonts-0.5
-	>=media-libs/libart_lgpl-2.3"
-RDEPEND="${DEPEND}
-${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	cvs_src_unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
-	cd ${S}
-}
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art --with-name=art"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.6-r1.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.6-r1.ebuild
index 4901f558b672..c66fa7d684f3 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.6-r1.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.6-r1.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/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.6-r1.ebuild,v 1.3 2005/12/16 11:18:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.6-r1.ebuild,v 1.4 2006/03/25 15:28:02 grobian Exp $
 
 inherit gnustep