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

(Portage version: 2.2_rc27/cvs/Linux i686)

3 files changed, 7 insertions, 64 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/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*