Version bump per bug #266745. Avoid kernel header issues per bug #236449. I know the last part of the build is forced non-parallel. It is not trivially fixable. Tell repoman to get lost.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 128 insertions, 3 deletions

diff --git a/sys-apps/hwinfo/ChangeLog b/sys-apps/hwinfo/ChangeLog
index 0c6fd6bda63c..6f430aef82af 100644
--- a/sys-apps/hwinfo/ChangeLog
+++ b/sys-apps/hwinfo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/hwinfo
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.10 2008/07/16 12:59:19 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.11 2010/02/01 06:58:56 robbat2 Exp $
+
+*hwinfo-16.0 (01 Feb 2010)
+
+  01 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +hwinfo-16.0.ebuild,
+  +files/hwinfo-16.0-parallel-fixes.patch:
+  Version bump per bug #266745. Avoid kernel header issues per bug #236449.
+  I know the last part of the build is forced non-parallel. It is not
+  trivially fixable. Tell repoman to get lost.
 
   16 Jul 2008; nixnut <nixnut@gentoo.org> hwinfo-13.28.ebuild:
   Stable on ppc wrt bug 231667
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 7017acdd7be7..67f7a4499d1a 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,6 @@
 AUX hwinfo-13.0-makefile-fixes.patch 465 RMD160 9ee69b43fb1cd158b1858cca4be1061689c83a28 SHA1 3090b80d5a03f8fd4667187bb7c1bf65812cd6fa SHA256 1fd1324f81e9f4e7418223bee75f36d3e328ed70bd6c3d394f519da4127de7b5
 AUX hwinfo-13.11-makefile-fixes.patch 496 RMD160 39ef9c0cd6669b7258b27bcf77dce37b185184d6 SHA1 716151df939a21ffe2f6ca392985ac00a0d6e452 SHA256 f5d6d2f1ea47a10af21697184c2e259689fc7847adcff9e5f31cb6118ea29612
+AUX hwinfo-16.0-parallel-fixes.patch 1299 RMD160 81446781340f6a85365eb344289b09a5f321185c SHA1 56f2ddd26a5bafbab807f94fbfe1f55550c5fe04 SHA256 100e1072c1b9e6b8e9705431f295396ba810d82a5f995d65028a0ed0331cfd9f
 AUX hwinfo-8.38-makefile-fixes.patch 2119 RMD160 1e5ee878154f78cfea59a7481542cad53eb1541c SHA1 d45797c8dc5b42b184679ea0ab903e35ac6fe264 SHA256 7db701f829dee500d286cc70c312342aac3d5d96e5192f028ccbaf02558d629a
 DIST hwinfo-8.38.tar.gz 569050 RMD160 3ccb827a4addb2688f7b1c7faf661ef8a6667c2f SHA1 339863afbd3472a6db266976398aa1b1157402cd SHA256 5b77373beb11ad558ba786a279580143214e1b5bd3e873b191c72bc266224ea2
 DIST hwinfo_13.0-4.diff.gz 10308 RMD160 bf323419c70c4e474d14e6b38fe4ebd042141827 SHA1 a68351f4504870c5daa6500ee8ff19696f9df52b SHA256 26b6da993ffafe471bdb86c9d2dacb3865b102e7fcad48f7cf288aa232a171dd
@@ -8,9 +9,12 @@ DIST hwinfo_13.28-1.diff.gz 8358 RMD160 eb3214fcb0ed9f8885d9718aa39ff335629ec1b7
 DIST hwinfo_13.28.orig.tar.gz 796912 RMD160 043553f1dcead1e9cb96a4b10fdf59475efa4dd7 SHA1 fbfaf317b08d507e8781b2daa7ca3a242a44c719 SHA256 5bf57faf048b1dd3881f84986c55b7ab89baf1592977e7af1210f74ade67221e
 DIST hwinfo_14.19-2.diff.gz 8888 RMD160 5b40203a5cd1cfde7d98ade76831228891f4c360 SHA1 024b15204069948a3c981ed13262558cde93b329 SHA256 94655931cc27ffac977b84985cae50c10c87333362cc0446e259089303a583f9
 DIST hwinfo_14.19.orig.tar.gz 838834 RMD160 2e88bd6ccf691cad3e5eceda5bf7739bf68da9ea SHA1 2848ac5df97e88a7d2ead75bc4778f398759df06 SHA256 73831deeea003d1f5abcada96ca29ffd4fa3d51406aa236632529edeac1e29af
+DIST hwinfo_16.0-2.diff.gz 10005 RMD160 6c44c70d557072356e2f7dcb5bfe1c8fb201d56c SHA1 04feee8733b0558539f17f9dbcc59fe46d6444d3 SHA256 b9ccc66c531beaee419c4930b50b097796893f647cbc82a5274f834eacd13400
+DIST hwinfo_16.0.orig.tar.gz 858557 RMD160 c80dddcef1416d29db31d036ef6a6affcd84841a SHA1 07a279906256e3a9a0ca99b959afff1edcf4e864 SHA256 6f46623806cdc5ea749b8e3f04caf18464becf3396c437ac058ae0b9768fe749
 EBUILD hwinfo-13.0.ebuild 1600 RMD160 e0169913f8be960f1bde0882fb0bd7b75e52c525 SHA1 a5b5f3164d688abf35ccee44ede56c4d6f3bc41a SHA256 1ed60ad57d5f652fd1e59dfee680dd081d7ad58ba46aded5f90c904ec70d442a
 EBUILD hwinfo-13.28.ebuild 1551 RMD160 5aeecdec87b37ffbfb25574d0d6739da97f81630 SHA1 579bda42de0cdd3564648f1d8cb27b7d1b12c236 SHA256 d4408f4553accbcb5f820192acb38270955aea1af9942697fb7d6277529be7c6
 EBUILD hwinfo-14.19.ebuild 1548 RMD160 dbbd844f80a3efd2659b7e63d3e0a9460deb96fc SHA1 abe4183008c76c48c9d54b939b7152439e48ebc9 SHA256 c892b9ed3536892b6cb9bb673279240a9ee49f807e0f58ebe4e735e89007bf42
+EBUILD hwinfo-16.0.ebuild 2505 RMD160 bb7e737ad5b80b1c5f0b1d51a196c42558661aaa SHA1 7a2578dd875c4e326caa7716ba24c2cd9100f865 SHA256 3d182abd8049587f81b7a1f8c193040107eac1223ef36697a172114f138efa88
 EBUILD hwinfo-8.38.ebuild 1068 RMD160 0fc76f8e03dd98d767acc93a56f7e3b439c3ebb4 SHA1 bae99b7b341acb34196ff4b37ed77342648d7628 SHA256 7e83114e43d7e99a210fd33446016b11ea72a4b3d04360f00d5e109b2f094fc0
-MISC ChangeLog 1730 RMD160 35717da82db00ce94b6272aee3cf42ef47ea5a87 SHA1 a6517510df9a1ef2959a82ced08e6aef6c4a37aa SHA256 4bb393d3f16dfb3e55d6f6de9f0f3f095d9350683505f124e89a11c501c5d9a8
+MISC ChangeLog 2070 RMD160 eb7b20fe90185911aa8788d50a20c18a9d000e24 SHA1 ea19dc4fd1cb4bddd600e93f67aeda34e6498d3b SHA256 a0cd7d464f4a08f7cc10537a503076431bd2ebed0716e029033088accd0674cd
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/sys-apps/hwinfo/files/hwinfo-16.0-parallel-fixes.patch b/sys-apps/hwinfo/files/hwinfo-16.0-parallel-fixes.patch
new file mode 100644
index 000000000000..221f34ca8a9a
--- /dev/null
+++ b/sys-apps/hwinfo/files/hwinfo-16.0-parallel-fixes.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..74ef918c6371
--- /dev/null
+++ b/sys-apps/hwinfo/hwinfo-16.0.ebuild
@@ -0,0 +1,71 @@
+# 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.1 2010/02/01 06:58:56 robbat2 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
+}
+
+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
+}