new release

Package-Manager: portage-2.1_pre4-r1

9 files changed, 67 insertions, 186 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index c6a4dbccc76c..48930446ba2d 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.131 2006/03/24 14:28:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.132 2006/04/07 15:05:32 foser Exp $
+
+*pango-1.12.1 (07 Apr 2006)
+
+  07 Apr 2006; Marinus Schraal <foser@gentoo.org> pango-1.12.1.ebuild :
+  Clean up X modular deps
+  Remove unneeded built_with_use checks
 
   24 Mar 2006; Aron Griffis <agriffis@gentoo.org> pango-1.10.3.ebuild:
   Mark 1.10.3 stable on ia64
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 661c3139110b..1e58d6739fbe 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,26 +1,66 @@
-MD5 46c6aeff4dcf3d7f552765928f092358 ChangeLog 14853
-MD5 ef459214ef4d92e406c804188498edfb files/digest-pango-1.10.1 244
+MD5 b6f03a14254bff7ac75f1d5e01a28533 ChangeLog 15018
+RMD160 6a7421f2d3f3e0e5aa220e2a4c2ed417f8905a31 ChangeLog 15018
+SHA256 db044d18821d0c205df1d519812089f2adfd62158c9c92a0a5cb3b4b6f91f098 ChangeLog 15018
 MD5 9fb4dec18e6aa5df32df1ef97b7878ca files/digest-pango-1.10.2 66
+RMD160 4dca5956f9459c7aa10a08629cc7fa3185be12ab files/digest-pango-1.10.2 66
+SHA256 3b89c920bc21c7a75d182a6252ffa846593268e0b16c3438a75e1b1b01c913ad files/digest-pango-1.10.2 66
 MD5 b9c6cf21fb850ffc6643818ed8f98665 files/digest-pango-1.10.3 66
+RMD160 1702d2239977ed32f9122b374a0fd633be301555 files/digest-pango-1.10.3 66
+SHA256 1b2b5086221529024fc6f6bf6c96ca5b7ce9a4226fd3b0533ed204f7ecb07786 files/digest-pango-1.10.3 66
 MD5 cd0d6a962ed64f778f4f9c2267c267c3 files/digest-pango-1.10.4 244
+RMD160 d43488239f06b16574656fbbcf02e1666466d31c files/digest-pango-1.10.4 244
+SHA256 9a9fc2b059be620d2e71d4add4b39895849313e67bdc571cc1c1e6ceb7d4fbf8 files/digest-pango-1.10.4 244
 MD5 03f17f89e3d881fa8462d09b1f53a895 files/digest-pango-1.12.0 244
+RMD160 295cdc40774a3e7fab51e1122eb2b676910828f2 files/digest-pango-1.12.0 244
+SHA256 10a069b91bbf4b93e48d6629bc6e2a2a99f80221e45ba0d070b6afa5574d7661 files/digest-pango-1.12.0 244
+MD5 48084c4dbb31e7a3c82014f4c17eaebe files/digest-pango-1.12.1 244
+RMD160 a48c1acdd657004086a2c630b8582f35ce89d433 files/digest-pango-1.12.1 244
+SHA256 b12909ddcfbc308df445a39782cf092325f1d257a1266bd8f28f8fd7119ed8da files/digest-pango-1.12.1 244
 MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
-MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1 64
+RMD160 871f55706279c715c6015cd0cc01a2a25e451447 files/digest-pango-1.4.1-r1 64
+SHA256 a8551ed9250790e91f7c22592c144c3a9b4376c3ccb42848c380063593fdf94e files/digest-pango-1.4.1-r1 64
 MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1-r1 64
-MD5 9fb05520cfa4d9c3f8e07f42192f075c files/digest-pango-1.8.2 241
+RMD160 5eae58ff592cee33ccd00f5d6ec8bc2c433db34f files/digest-pango-1.8.1-r1 64
+SHA256 94dbd8f08ae96c54ce03b88460bb4a8b588dd1a5392f1b1204d6da7510913a10 files/digest-pango-1.8.1-r1 64
 MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
+RMD160 31e9407bce8f29055bf4ddb2631bf8bff1f87073 files/pango-1.0.99.020606-xfonts.patch 4560
+SHA256 b7590b71869223d7c0ac3952fa4c406601bef7b5927d073bef26a38916938bb8 files/pango-1.0.99.020606-xfonts.patch 4560
 MD5 40faa11ac45a2600e6b3c7eeec64cc50 files/pango-1.10.2-slighthint.patch 1069
+RMD160 cce55e17f29aff964e25870e7123a892e4b34b30 files/pango-1.10.2-slighthint.patch 1069
+SHA256 6a9b67aec4c2c0d3c9b6e626117ce31e48f4d280f04f6b880bd36005523069f0 files/pango-1.10.2-slighthint.patch 1069
 MD5 b6a4250ddaea4f18ec8d7e05663cce83 files/pango-1.11.3-xfonts.patch 4540
+RMD160 1e0f2ed25a0c461554139f647d004298c5b7cc9c files/pango-1.11.3-xfonts.patch 4540
+SHA256 8c4ac42e9a61eb9d174420b8bdc22e41bab06de758200f2e3a036a5d82282fa8 files/pango-1.11.3-xfonts.patch 4540
 MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
+RMD160 c5e1d175f8bdf480c85121b94541ea7012919c9a files/pango-1.2.2-slighthint.patch 1124
+SHA256 ab7f65d18a1fde2dd7a941908f5a04c000b8c24d1711303945d5fadd42bf5b14 files/pango-1.2.2-slighthint.patch 1124
 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
+RMD160 1a0ceb7f6b0cbf7c1a62ad9920fa91713a767809 files/pango-1.2.5-lib64.patch 1107
+SHA256 010aa771c0662b056e1668d0607397f670cb030da252d7d95a9eea270fbc9ec9 files/pango-1.2.5-lib64.patch 1107
 MD5 8de5114d2f4367487b3d70b712115ec4 files/pango-1.8.1-fontfix.patch 1320
+RMD160 10cd381bc79029f0eb3899151175ef4f57d8e5d7 files/pango-1.8.1-fontfix.patch 1320
+SHA256 aa8491a712999035d8635aafb1a8ccaa9b1e121c5c2c4186cbda8f1ee50ede32 files/pango-1.8.1-fontfix.patch 1320
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 67536000773a531c886202e015e9795d pango-1.10.1.ebuild 2164
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
 MD5 e04a08df91754a51964f9f5fd4e10f3c pango-1.10.2.ebuild 2159
+RMD160 b826aa1a85bc496ddd44729b3d03fca70ad40250 pango-1.10.2.ebuild 2159
+SHA256 fc1105eaeaccd56f81aa59f6cb42bfdddc115e3892a3583163ca64168fd7c103 pango-1.10.2.ebuild 2159
 MD5 77414161a344bf1bf2d6b15bcbf192f5 pango-1.10.3.ebuild 2160
+RMD160 c15a971f77150f1d4073f2597aee9e1ad319b1a6 pango-1.10.3.ebuild 2160
+SHA256 0d6be3a8d156163a82676d9a890bc3ac3c6c3135f35d6b82c1378fbcb0b844c9 pango-1.10.3.ebuild 2160
 MD5 5e4584929cf0788045d9f8500092f84e pango-1.10.4.ebuild 2168
+RMD160 386480bc11a9d9605a09a0aafeb827cb606e2e3e pango-1.10.4.ebuild 2168
+SHA256 2a7c8f03b1f01c4686600edf3cde6fdaf16e416a38ceae24343c2d3795dc783c pango-1.10.4.ebuild 2168
 MD5 8ee79ecb6f23578d5cb4fd2faa2dd2f7 pango-1.12.0.ebuild 2175
+RMD160 e959165daf449b83b0dd7efdc23b93cfe2a6604f pango-1.12.0.ebuild 2175
+SHA256 6be9d2e04d15660969d0578f83851ba889a35c6bcc0613dcd7d02110d516f8c3 pango-1.12.0.ebuild 2175
+MD5 6df5d6c2fe43d64f718d5d4fd6c48624 pango-1.12.1.ebuild 1974
+RMD160 d7c0bc61e48ddbd16d014a8758d1e74291bc5ccf pango-1.12.1.ebuild 1974
+SHA256 1036f61cce01879fe059f703c10001142b609d2b671d69f6251c1b80c58e2725 pango-1.12.1.ebuild 1974
 MD5 c05eedb951eabcb1ac4993e76d4e6144 pango-1.4.1-r1.ebuild 1974
+RMD160 7ff17e4514f45bbb7af5e8ed05a6b96ed94394e5 pango-1.4.1-r1.ebuild 1974
+SHA256 4fa219d84193b155e4a069368e03b0fdea4e5cf01cab8229c59b9e8f268750ca pango-1.4.1-r1.ebuild 1974
 MD5 4ecb136f42b2ead5ea4f3380b3cdb949 pango-1.8.1-r1.ebuild 2071
-MD5 592e8807c47babfaa04a1f2f29580e25 pango-1.8.1.ebuild 2003
-MD5 b3b05ed01f641a0296142d163165f783 pango-1.8.2.ebuild 1944
+RMD160 b35fa97f1d6085f973a03643c33cf2868f7fe52b pango-1.8.1-r1.ebuild 2071
+SHA256 fb9772c0cd7372436b2dbf0a2e1236619177b071720c07cdcb62c8648be6b6fe pango-1.8.1-r1.ebuild 2071
diff --git a/x11-libs/pango/files/digest-pango-1.10.1 b/x11-libs/pango/files/digest-pango-1.10.1
deleted file mode 100644
index 7a1bd86c7af9..000000000000
--- a/x11-libs/pango/files/digest-pango-1.10.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1ff4c96982f61ea6f390d09a4febdf18 pango-1.10.1.tar.bz2 1186783
-RMD160 62594e874338e334519c7161a742753a8fa50b31 pango-1.10.1.tar.bz2 1186783
-SHA256 2c86f3c7c586afefc0594d6ddefc527f29952a3e772f69f55b9d3704cb464979 pango-1.10.1.tar.bz2 1186783
diff --git a/x11-libs/pango/files/digest-pango-1.12.1 b/x11-libs/pango/files/digest-pango-1.12.1
new file mode 100644
index 000000000000..1f4311f0b89e
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.12.1
@@ -0,0 +1,3 @@
+MD5 10ddfbc43cf895639b77788ca637409c pango-1.12.1.tar.bz2 1208619
+RMD160 9dc4da7e9ace4391e907602e55321443b144278b pango-1.12.1.tar.bz2 1208619
+SHA256 58910d7bf3766fba5cc9975ff29cd10fa828732e3466d03a4134bd767ba510b6 pango-1.12.1.tar.bz2 1208619
diff --git a/x11-libs/pango/files/digest-pango-1.8.1 b/x11-libs/pango/files/digest-pango-1.8.1
deleted file mode 100644
index 01c4a071f380..000000000000
--- a/x11-libs/pango/files/digest-pango-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88aa6bf1876766db6864f3b93577887c pango-1.8.1.tar.bz2 996389
diff --git a/x11-libs/pango/files/digest-pango-1.8.2 b/x11-libs/pango/files/digest-pango-1.8.2
deleted file mode 100644
index ef14217e7bab..000000000000
--- a/x11-libs/pango/files/digest-pango-1.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f5b5da7a173f0566d8217ec112fde993 pango-1.8.2.tar.bz2 1021372
-RMD160 fc44c26d6f3543ca6054c996a4edc772b888de2a pango-1.8.2.tar.bz2 1021372
-SHA256 4cf04489ff291f3f1835783b8cfa8347d99f6a05d7d9da21c8d737f441bea3ac pango-1.8.2.tar.bz2 1021372
diff --git a/x11-libs/pango/pango-1.10.1.ebuild b/x11-libs/pango/pango-1.12.1.ebuild
index 044dd3ad2643..1319343e67ee 100644
--- a/x11-libs/pango/pango-1.10.1.ebuild
+++ b/x11-libs/pango/pango-1.12.1.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-libs/pango/pango-1.10.1.ebuild,v 1.4 2005/10/30 01:03:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.1.ebuild,v 1.1 2006/04/07 15:05:33 foser Exp $
 
 inherit eutils gnome2
 
@@ -15,14 +15,13 @@ IUSE="doc"
 RDEPEND="|| ( (
 		x11-libs/libXrender
 		x11-libs/libX11
-		x11-libs/libXt
+		x11-libs/libXft
 		)
-	virtual/x11 )
-	virtual/xft
-	>=dev-libs/glib-2.5.7
+		virtual/x11 )
+	>=dev-libs/glib-2.10.0
 	>=media-libs/fontconfig-1.0.1
 	>=media-libs/freetype-2
-	>x11-libs/cairo-0.5.2"
+	>x11-libs/cairo-1.0.0"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
@@ -32,23 +31,16 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )"
 
 DOCS="AUTHORS ChangeLog* NEWS README TODO*"
-USE_DESTDIR="1"
-
-
-pkg_setup() {
-	if ! built_with_use -a x11-libs/cairo png X; then
-		einfo "Please re-emerge x11-libs/cairo with the png and X USE flags set"
-		die "cairo needs png and X flags set"
-	fi
-}
 
 src_unpack() {
+
 	unpack "${A}"
 	cd "${S}"
 
 	# Some enhancements from Redhat
-	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.2.2-slighthint.patch
+	# These NEED to go upstream.
+	epatch ${FILESDIR}/pango-1.11.3-xfonts.patch
+	epatch ${FILESDIR}/${PN}-1.10.2-slighthint.patch
 
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system
diff --git a/x11-libs/pango/pango-1.8.1.ebuild b/x11-libs/pango/pango-1.8.1.ebuild
deleted file mode 100644
index be1e6ee87020..000000000000
--- a/x11-libs/pango/pango-1.8.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.1.ebuild,v 1.10 2006/02/06 22:27:30 compnerd Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Text rendering and layout library"
-HOMEPAGE="http://www.pango.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2"
-
-LICENSE="LGPL-2 FTL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="doc static"
-
-RDEPEND="|| (
-				(
-					x11-libs/libXt
-					x11-libs/libX11
-					x11-libs/libXrender
-				)
-				virtual/x11
-			)
-	virtual/xft
-	>=dev-libs/glib-2.6
-	>=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Some enhancements from Redhat
-	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.2.2-slighthint.patch
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system
-	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
-
-	epunt_cxx
-
-}
-
-DOCS="AUTHORS ChangeLog README INSTALL NEWS TODO*"
-
-G2CONF="${G2CONF} `use_enable static`"
-
-src_install() {
-
-	gnome2_src_install
-
-	rm ${D}/etc/pango/pango.modules
-	use amd64 && mkdir ${D}/etc/pango/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST}
-
-}
-
-pkg_postinst() {
-
-	if [ "${ROOT}" == "/" ] ; then
-		einfo "Generating modules listing..."
-		use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
-		use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
-		PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango/}
-		pango-querymodules > /${PANGO_CONFDIR}/pango.modules
-	fi
-
-}
-
-USE_DESTDIR="1"
diff --git a/x11-libs/pango/pango-1.8.2.ebuild b/x11-libs/pango/pango-1.8.2.ebuild
deleted file mode 100644
index d982112fa22a..000000000000
--- a/x11-libs/pango/pango-1.8.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.2.ebuild,v 1.3 2006/02/06 22:27:30 compnerd Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Text rendering and layout library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2 FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static"
-
-RDEPEND="|| (
-				(
-					x11-libs/libXt
-					x11-libs/libX11
-					x11-libs/libXrender
-				)
-				virtual/x11
-			)
-	virtual/xft
-	>=dev-libs/glib-2.5.7
-	>=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2.1.8"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO*"
-G2CONF="${G2CONF} $(use_enable static)"
-USE_DESTDIR="1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Some enhancements from Redhat
-	epatch ${FILESDIR}/${PN}-1.0.99.020606-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.2.2-slighthint.patch
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system
-	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
-
-	epunt_cxx
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	rm ${D}/etc/pango/pango.modules
-	use amd64 && mkdir ${D}/etc/pango/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST}
-
-}
-
-pkg_postinst() {
-
-	if [ "${ROOT}" == "/" ] ; then
-		einfo "Generating modules listing..."
-		use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
-		use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
-		PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango/}
-		pango-querymodules > /${PANGO_CONFDIR}/pango.modules
-	fi
-
-}