Stable for HPPA (bug #223357). Remove old.

Package-Manager: portage-2.2_rc27/cvs/Linux i686

4 files changed, 9 insertions, 67 deletions

diff --git a/dev-python/pyxf86config/ChangeLog b/dev-python/pyxf86config/ChangeLog
index d03d814c1e02..6c61282abb25 100644
--- a/dev-python/pyxf86config/ChangeLog
+++ b/dev-python/pyxf86config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyxf86config
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.31 2009/02/23 16:40:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.32 2009/03/27 22:47:43 jer Exp $
+
+  27 Mar 2009; Jeroen Roovers <jer@gentoo.org>
+  -pyxf86config-0.3.34-r1.ebuild, pyxf86config-0.3.34-r2.ebuild:
+  Stable for HPPA (bug #223357). Remove old.
 
   23 Feb 2009; Joseph Jezak <josejx@gentoo.org>
   pyxf86config-0.3.34-r2.ebuild:
diff --git a/dev-python/pyxf86config/Manifest b/dev-python/pyxf86config/Manifest
index 52d9c4b1f4fc..8e95db04bc42 100644
--- a/dev-python/pyxf86config/Manifest
+++ b/dev-python/pyxf86config/Manifest
@@ -3,7 +3,6 @@ AUX 0.3.34-remove-rgbpath.patch 679 RMD160 62f466be39a1a06d2a72d6cbf0a24aae8417e
 AUX Makefile.am 452 RMD160 17d5221814db6d90ac6f636b059ed7fb8574f421 SHA1 da65727e13559eff5f2838234d778acc439b6237 SHA256 85a2535526270dd55fee9ab92c7fcfeafc585fe8d2593dd0d3edd82a0f90ae0d
 AUX xorg-server-1.4-compat.patch 3386 RMD160 eb1597c4ec05069a9bb4eabac87e50b49d1484dc SHA1 e1d2d9c1f6298b6ec0589910db136610f7e5a14c SHA256 1a398006540986dbed9d61a85623054c6614d64bf2e832cd02e956b6f4082317
 DIST pyxf86config-0.3.34-1.fc8.src.rpm 252972 RMD160 57c0d00e4f4e81f49a5ecd6e56dbb308f0d9c3bc SHA1 15833e4c13a969370fa73afc9a372178bbc424a2 SHA256 ea9486bde7f80ba427964d70fda7c2497a60463068e8d403177a68385b69481b
-EBUILD pyxf86config-0.3.34-r1.ebuild 1714 RMD160 8f36e83b35436774694e31ad84a2c0ec077f4302 SHA1 acfe314d08eae940b9a4d488ded1086196eb8d79 SHA256 1d1c581d01a2ae6e0f46be5482b1bf341a310c1046dddf637eeaa07eb734de5f
-EBUILD pyxf86config-0.3.34-r2.ebuild 1589 RMD160 62a3cb7f40442ba637808b7e45c7e320cee4e306 SHA1 8b9d30ab513954e9e9a108ed06cfe27e0f5833a1 SHA256 7be53b325924875e88666c4c7a62e041d15e03c6a4cadc9104e321c0860d0f04
-MISC ChangeLog 4706 RMD160 d8353f99816a872406fc66ed8cbf278cf1294d4b SHA1 cc461ca4dc9dc971bcc974f54c60821bf0d0a47e SHA256 7678a5165b2c2cc046539ca06a0aefd9181b236b79de57df48656194e4f3ff49
+EBUILD pyxf86config-0.3.34-r2.ebuild 1585 RMD160 7a6da9e03e62124baafe42fc729a4d44fef944c5 SHA1 03f8adbd43c633a0aa89885997e4ba214a065c10 SHA256 786700670bbc28a3c42a8988ad6732e1a093b54ba9bc28fdf3aa8f233b7abb37
+MISC ChangeLog 4861 RMD160 7105e17f9881ea5df047012afe4182453eb1ae1b SHA1 e6d88c9880006836c72b5c576d2427f60e09500b SHA256 75150812ccfcf6f33fb8bb310e9ee4138d4f9495708b3723e7a33fb613305e49
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
diff --git a/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild b/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild
deleted file mode 100644
index 741d012f2f24..000000000000
--- a/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild,v 1.17 2009/01/04 21:44:20 patrick Exp $
-
-inherit eutils python rpm autotools
-
-# Tag for which Fedora Core version it's from
-FCVER="8"
-
-# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
-# tarball out of it
-RPMREV="1"
-
-DESCRIPTION="Python wrappers for libxf86config"
-HOMEPAGE="http://fedoraproject.org/wiki/Pyxf86config"
-SRC_URI="mirror://fedora-dev/development/source/SRPMS/${P}-${RPMREV}.fc${FCVER}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="=dev-libs/glib-2*
-		  dev-lang/python"
-DEPEND="${RDEPEND}
-		>=x11-base/xorg-server-1.1.1-r1"
-
-pkg_setup() {
-	if built_with_use x11-base/xorg-server minimal; then
-		eerror "To build ${PN} you need the libxf86config static library from"
-		eerror "x11-base/xorg-server, which is not built when the minimal USE flag is used."
-		eerror "Please disable the minimal USE flag for x11-base/xorg-server"
-		die "Missing libxf86config.a"
-	fi
-}
-
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-
-	if has_version '>=x11-base/xorg-server-1.4' ; then
-		epatch "${FILESDIR}/xorg-server-1.4-compat.patch"
-	fi
-
-	# Compat with 1.5
-	epatch "${FILESDIR}"/0.3.34-remove-rgbpath.patch
-
-	# (#206989) Cleaned up Makefile.am that works correctly on amd64
-	cp "${FILESDIR}"/Makefile.am "${S}"/ || die
-	eautoreconf
-}
-
-src_compile() {
-	python_version
-	econf --with-python-version=${PYVER} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/dev-python/pyxf86config/pyxf86config-0.3.34-r2.ebuild b/dev-python/pyxf86config/pyxf86config-0.3.34-r2.ebuild
index d9baad4e31a5..d705f2a7f711 100644
--- a/dev-python/pyxf86config/pyxf86config-0.3.34-r2.ebuild
+++ b/dev-python/pyxf86config/pyxf86config-0.3.34-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/pyxf86config-0.3.34-r2.ebuild,v 1.8 2009/02/23 16:40:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/pyxf86config-0.3.34-r2.ebuild,v 1.9 2009/03/27 22:47:43 jer Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://fedora-dev/development/source/SRPMS/${P}-${RPMREV}.fc${FCVER}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="=dev-libs/glib-2*