Remove PowerPC keywording wrt #342753. drop old.

(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)

6 files changed, 6 insertions, 150 deletions

diff --git a/sys-apps/hwinfo/ChangeLog b/sys-apps/hwinfo/ChangeLog
index dccad9b04cee..aa0d17bea475 100644
--- a/sys-apps/hwinfo/ChangeLog
+++ b/sys-apps/hwinfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/hwinfo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.18 2010/11/01 12:53:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.19 2010/11/01 17:56:18 ssuominen Exp $
+
+  01 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> hwinfo-18.1.ebuild:
+  Remove PowerPC keywording wrt #342753.
 
   01 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> hwinfo-18.1.ebuild:
   x86 stable wrt bug #342753
diff --git a/sys-apps/hwinfo/files/hwinfo-13.11-makefile-fixes.patch b/sys-apps/hwinfo/files/hwinfo-13.11-makefile-fixes.patch
deleted file mode 100644
index 0497ad8407b6..000000000000
--- a/sys-apps/hwinfo/files/hwinfo-13.11-makefile-fixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN hwinfo-13.11/Makefile.common hwinfo-13.11.new/Makefile.common
---- hwinfo-13.11/Makefile.common	2006-09-11 11:36:57.000000000 +0100
-+++ hwinfo-13.11.new/Makefile.common	2007-01-22 18:43:43.000000000 +0000
-@@ -22,7 +22,7 @@
- 
- CC	= gcc
- LD	= ld
--CFLAGS	= $(RPM_OPT_FLAGS) -Wall -Wno-pointer-sign -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
-+CFLAGS	= $(RPM_OPT_FLAGS) -Wall -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
- SHARED_FLAGS	= -fPIC
- 
- LDFLAGS	= -Lsrc
diff --git a/sys-apps/hwinfo/files/hwinfo-16.0-asneeded.patch b/sys-apps/hwinfo/files/hwinfo-16.0-asneeded.patch
deleted file mode 100644
index 571a757a8583..000000000000
--- a/sys-apps/hwinfo/files/hwinfo-16.0-asneeded.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fixing as-needed issues and respecting LDFLAGS
-
-http://bugs.gentoo.org/313369
-
---- src/Makefile
-+++ src/Makefile
-@@ -23,9 +23,9 @@
- 
- ifdef SHARED_FLAGS
- $(LIBHD_SO): $(LIBHD)
--	$(CC) -shared $(SO_LIBS) -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \
-+	$(CC) $(LDFLAGS) -shared -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \
- 		-Wl,-soname=$(LIBHD_SONAME) \
--		-o $(LIBHD_SO) 
-+		-o $(LIBHD_SO) $(SO_LIBS) 
- 	ln -snf $(LIBHD_NAME) $(LIBHD_SONAME)
- 	ln -snf $(LIBHD_SONAME) $(LIBHD_BASE).so
- else
diff --git a/sys-apps/hwinfo/files/hwinfo-16.0-parallel-fixes.patch b/sys-apps/hwinfo/files/hwinfo-16.0-parallel-fixes.patch
deleted file mode 100644
index 221f34ca8a9a..000000000000
--- a/sys-apps/hwinfo/files/hwinfo-16.0-parallel-fixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nuar hwinfo-16.0.orig/src/ids/Makefile hwinfo-16.0/src/ids/Makefile
---- hwinfo-16.0.orig/src/ids/Makefile	2009-05-12 03:10:34.000000000 -0700
-+++ hwinfo-16.0/src/ids/Makefile	2009-07-03 13:55:42.522438453 -0700
-@@ -55,8 +55,11 @@
- 
- hd_ids.c: hd_ids.h hd_ids_tiny.h
- 
--hd_ids.h hd.ids: check_hd $(IDFILES)
-+hd_ids.h hd.ids: build_ids
-+
-+build_ids: check_hd $(IDFILES)
- 	./check_hd --check --sort --cfile hd_ids.h $(IDFILES)
-+	touch build_ids
- 
- hd_ids_tiny.h: check_hd hd.ids
- 	./check_hd --mini --cfile hd_ids_tiny.h --log=hd_tiny.log --out=hd_tiny.ids hd.ids
-diff -Nuar hwinfo-16.0.orig/src/isdn/cdb/Makefile hwinfo-16.0/src/isdn/cdb/Makefile
---- hwinfo-16.0.orig/src/isdn/cdb/Makefile	2009-05-12 03:10:34.000000000 -0700
-+++ hwinfo-16.0/src/isdn/cdb/Makefile	2009-07-03 14:13:54.336372459 -0700
-@@ -12,8 +12,9 @@
- 	fi
- 
- isdn_cdb.h: isdn_cdb ISDN.CDB.txt
--	rm -f isdn_cdb.h
--	./isdn_cdb ISDN.CDB.txt isdn_cdb.h
-+	rm -f $@
-+	./isdn_cdb ISDN.CDB.txt $@.tmp
-+	mv $@.tmp $@
- 
- lex.yy.c: isdn_cdb.lex
- 	lex isdn_cdb.lex
-@@ -29,5 +30,8 @@
- mk_isdnhwdb.o: mk_isdnhwdb.c cdb_read.h lex.yy.c
- 
- ISDN.CDB.hwdb: mk_isdnhwdb ISDN.CDB.txt
--	rm -f  ISDN.CDB.hwdb
--	./mk_isdnhwdb ISDN.CDB.txt ISDN.CDB.hwdb
-+	rm -f $@
-+	./mk_isdnhwdb ISDN.CDB.txt $@.tmp
-+	mv $@.tmp $@
-+
-+OBJS += isdn_cdb.h ISDN.CDB.hwdb
diff --git a/sys-apps/hwinfo/hwinfo-16.0.ebuild b/sys-apps/hwinfo/hwinfo-16.0.ebuild
deleted file mode 100644
index 4a076f1e348c..000000000000
--- a/sys-apps/hwinfo/hwinfo-16.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-16.0.ebuild,v 1.5 2010/06/29 18:29:21 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="hwinfo is the hardware detection tool used in SuSE Linux."
-HOMEPAGE="http://www.suse.com"
-DEBIAN_PV="2"
-DEBIAN_BASE_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/"
-SRC_URI="${DEBIAN_BASE_URI}/${PN}_${PV}.orig.tar.gz
-		 ${DEBIAN_BASE_URI}/${PN}_${PV}-${DEBIAN_PV}.diff.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RDEPEND=">=sys-fs/sysfsutils-2
-		sys-apps/hal
-		sys-apps/dbus"
-# this package won't work on *BSD
-DEPEND="${RDEPEND}
-		>=sys-kernel/linux-headers-2.6.17"
-
-src_unpack (){
-	unpack ${PN}_${PV}.orig.tar.gz
-}
-
-src_prepare() {
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${DISTDIR}"/${PN}_${PV}-${DEBIAN_PV}.diff.gz
-	cd "${S}"
-	for i in $(<"${S}"/debian/patches/series) ; do
-		EPATCH_SUFFIX="" EPATCH_FORCE="yes" epatch "${S}"/debian/patches/${i}
-	done
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-13.11-makefile-fixes.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-16.0-parallel-fixes.patch
-	#sed -i -e "s,^LIBS[ \t]*= -lhd,LIBS = -lhd -lsysfs," ${S}/Makefile
-	#sed -i -e "s,^LIBDIR[ \t]*= /usr/lib$,LIBDIR = /usr/$(get_libdir)," ${S}/Makefile
-	sed -i -e 's,make,$(MAKE),g' "${S}"/Makefile "${S}"/Makefile.common
-	sed -i -e '/^touch:/s,$, $(LIBHD),g' "${S}"/src/Makefile
-	sed -i -e '/^hw[a-z]\+:.*$(LIBHD)/s,$, subdirs ranlib,g' "${S}"/Makefile
-	echo '$(LIBHD): subdirs' >>"${S}"/Makefile
-	for i in src/{,ids,hd,isdn,isdn/cdb,int10,smp} ; do
-		echo 'objects: $(OBJS) $(LIBHD)' >>"${S}"/${i}/Makefile
-		echo '$(OBJS): subdirs' >>"${S}"/${i}/Makefile
-		echo 'libs: $(LIBHD) subdirs $(OBJS)' >>"${S}"/${i}/Makefile
-	done
-
-	echo 'libs:' >>"${S}"/src/x86emu/Makefile
-
-	echo 'libs: subdirs' >>"${S}"/Makefile
-	echo 'ranlib: $(LIBHD) subdirs' >>"${S}"/Makefile
-	echo -e "\tranlib \$(LIBHD)" >>"${S}"/Makefile
-
-	sed -i -e 's/LDFLAGS	= /LDFLAGS := $(LDFLAGS) /' "${S}"/Makefile.common || die
-	sed -i -e 's/(CFLAGS)/& $(LDFLAGS)/' "${S}"/src/ids/Makefile || die
-	epatch "${FILESDIR}"/${PN}-16.0-asneeded.patch
-}
-
-src_compile(){
-	# build is NOT parallel safe, and the build system blows goats
-	einfo "ISDN CDB pass"
-	emake EXTRA_FLAGS="${CFLAGS}" -C 'src/isdn/cdb' || die "emake failed"
-	einfo "LIBS pass"
-	emake EXTRA_FLAGS="${CFLAGS}" libs || die "emake failed"
-	einfo "FINAL pass"
-	emake -j1 EXTRA_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	[[ "$(get_libdir)" != "lib" ]] && mv "${D}"/usr/lib "${D}/usr/$(get_libdir)"
-	dodoc VERSION README
-	doman doc/hwinfo.8
-}
diff --git a/sys-apps/hwinfo/hwinfo-18.1.ebuild b/sys-apps/hwinfo/hwinfo-18.1.ebuild
index 8c3f469fbd6d..23826d5d6ddc 100644
--- a/sys-apps/hwinfo/hwinfo-18.1.ebuild
+++ b/sys-apps/hwinfo/hwinfo-18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-18.1.ebuild,v 1.6 2010/11/01 12:53:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-18.1.ebuild,v 1.7 2010/11/01 17:56:18 ssuominen Exp $
 
 EAPI=2
 inherit multilib rpm toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.9.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-libs/libx86emu"