Fix for GCC4 breakages with a version bump, bug #140911.

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 89 insertions, 5 deletions

diff --git a/sys-apps/hwinfo/ChangeLog b/sys-apps/hwinfo/ChangeLog
index 971d10754740..1af1c5868f52 100644
--- a/sys-apps/hwinfo/ChangeLog
+++ b/sys-apps/hwinfo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hwinfo
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.2 2005/07/04 07:45:03 dholm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.3 2006/07/22 04:31:17 robbat2 Exp $
+
+*hwinfo-13.0 (22 Jul 2006)
+
+  22 Jul 2006; Robin H. Johnson <robbat2@gentoo.org> +hwinfo-13.0.ebuild:
+  Fix for GCC4 breakages with a version bump, bug #140911.
 
   04 Jul 2005; David Holm <dholm@gentoo.org> hwinfo-8.38.ebuild:
   Added to ~ppc.
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index fff0a0f96fb7..522d8936bc46 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,29 @@
-MD5 2fac8e80743197100e580e82a9a495b2 ChangeLog 636
+AUX hwinfo-8.38-makefile-fixes.patch 2119 RMD160 1e5ee878154f78cfea59a7481542cad53eb1541c SHA1 d45797c8dc5b42b184679ea0ab903e35ac6fe264 SHA256 7db701f829dee500d286cc70c312342aac3d5d96e5192f028ccbaf02558d629a
+MD5 9bf18c38512621782e2f300bdf133d38 files/hwinfo-8.38-makefile-fixes.patch 2119
+RMD160 1e5ee878154f78cfea59a7481542cad53eb1541c files/hwinfo-8.38-makefile-fixes.patch 2119
+SHA256 7db701f829dee500d286cc70c312342aac3d5d96e5192f028ccbaf02558d629a files/hwinfo-8.38-makefile-fixes.patch 2119
+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
+DIST hwinfo_13.0.orig.tar.gz 792900 RMD160 26dba3dea1553da097208b93d54d65b981820ef0 SHA1 3c7bee9eec23a6e53eb1a67b229bfcc605fb1fc5 SHA256 35f3affcd122cecf98435fbeff8971149faa80e5b3c4c31664ba6167f2566ad9
+EBUILD hwinfo-13.0.ebuild 1499 RMD160 091a2798273c5427d02fd417ce9237d6ee923ba3 SHA1 80b05beb59135a604812be16713c5e6a02164b02 SHA256 083a38e960831dcb2bcdaf24dd9fea14cf4e26f3642fdc07eebc7eb7f7b87d81
+MD5 f8182af846c241644e52d403f938084b hwinfo-13.0.ebuild 1499
+RMD160 091a2798273c5427d02fd417ce9237d6ee923ba3 hwinfo-13.0.ebuild 1499
+SHA256 083a38e960831dcb2bcdaf24dd9fea14cf4e26f3642fdc07eebc7eb7f7b87d81 hwinfo-13.0.ebuild 1499
+EBUILD hwinfo-8.38.ebuild 1068 RMD160 0fc76f8e03dd98d767acc93a56f7e3b439c3ebb4 SHA1 bae99b7b341acb34196ff4b37ed77342648d7628 SHA256 7e83114e43d7e99a210fd33446016b11ea72a4b3d04360f00d5e109b2f094fc0
 MD5 e614d3fa834eb77b781bf692a14442b6 hwinfo-8.38.ebuild 1068
+RMD160 0fc76f8e03dd98d767acc93a56f7e3b439c3ebb4 hwinfo-8.38.ebuild 1068
+SHA256 7e83114e43d7e99a210fd33446016b11ea72a4b3d04360f00d5e109b2f094fc0 hwinfo-8.38.ebuild 1068
+MISC ChangeLog 800 RMD160 c0f30bd3f3e77cada06a8c21ba862443443714b2 SHA1 91729ee007984ae84f5106a96ee1b4201840325f SHA256 3f1f3c657806c544ee2e1d944448e03df5c788092ff53e40920973697bf1c287
+MD5 e3fb01a454e85207adda3138afacc139 ChangeLog 800
+RMD160 c0f30bd3f3e77cada06a8c21ba862443443714b2 ChangeLog 800
+SHA256 3f1f3c657806c544ee2e1d944448e03df5c788092ff53e40920973697bf1c287 ChangeLog 800
+MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-MD5 d2128a1dac4f1bc44f7184145687bd22 files/digest-hwinfo-8.38 63
-MD5 9bf18c38512621782e2f300bdf133d38 files/hwinfo-8.38-makefile-fixes.patch 2119
+RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
+SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
+MD5 c60a7048bd2c980bab8960fd7cd879d2 files/digest-hwinfo-13.0 491
+RMD160 c7460207a0b6f643cea1efc799750242da751518 files/digest-hwinfo-13.0 491
+SHA256 ab433be48fa147fb67a20be0b4bbfee1c09ee19cbe64cae1fb7ebe1871cec9e7 files/digest-hwinfo-13.0 491
+MD5 88c0a6d80b64cb57084568fa102a4adb files/digest-hwinfo-8.38 235
+RMD160 6511b109ecddaca4b6da2383599da902c95fafdb files/digest-hwinfo-8.38 235
+SHA256 d3136ba3bc2c1f1096d635185ce96b3d5214b9f056612d49f1bf34633a487851 files/digest-hwinfo-8.38 235
diff --git a/sys-apps/hwinfo/files/digest-hwinfo-13.0 b/sys-apps/hwinfo/files/digest-hwinfo-13.0
new file mode 100644
index 000000000000..5e0fa1bf0cf9
--- /dev/null
+++ b/sys-apps/hwinfo/files/digest-hwinfo-13.0
@@ -0,0 +1,6 @@
+MD5 86481141f48b6539e6b4cbb3eca6a50e hwinfo_13.0-4.diff.gz 10308
+RMD160 bf323419c70c4e474d14e6b38fe4ebd042141827 hwinfo_13.0-4.diff.gz 10308
+SHA256 26b6da993ffafe471bdb86c9d2dacb3865b102e7fcad48f7cf288aa232a171dd hwinfo_13.0-4.diff.gz 10308
+MD5 f56351cd8ddda192c3e2c7379c7f9920 hwinfo_13.0.orig.tar.gz 792900
+RMD160 26dba3dea1553da097208b93d54d65b981820ef0 hwinfo_13.0.orig.tar.gz 792900
+SHA256 35f3affcd122cecf98435fbeff8971149faa80e5b3c4c31664ba6167f2566ad9 hwinfo_13.0.orig.tar.gz 792900
diff --git a/sys-apps/hwinfo/files/digest-hwinfo-8.38 b/sys-apps/hwinfo/files/digest-hwinfo-8.38
index 7345fad85c44..f64457231b3a 100644
--- a/sys-apps/hwinfo/files/digest-hwinfo-8.38
+++ b/sys-apps/hwinfo/files/digest-hwinfo-8.38
@@ -1 +1,3 @@
 MD5 260f89a3a64e215105e07cfc1ac2fced hwinfo-8.38.tar.gz 569050
+RMD160 3ccb827a4addb2688f7b1c7faf661ef8a6667c2f hwinfo-8.38.tar.gz 569050
+SHA256 5b77373beb11ad558ba786a279580143214e1b5bd3e873b191c72bc266224ea2 hwinfo-8.38.tar.gz 569050
diff --git a/sys-apps/hwinfo/hwinfo-13.0.ebuild b/sys-apps/hwinfo/hwinfo-13.0.ebuild
new file mode 100644
index 000000000000..4a016e44b1c8
--- /dev/null
+++ b/sys-apps/hwinfo/hwinfo-13.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-13.0.ebuild,v 1.1 2006/07/22 04:31:17 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="hwinfo is the hardware detection tool used in SuSE Linux."
+HOMEPAGE="http://www.suse.com"
+DEBIAN_PV="4"
+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="~ppc ~x86"
+IUSE=""
+DEPEND="sys-fs/sysfsutils
+		sys-apps/hal
+		sys-apps/dbus"
+
+src_unpack (){
+	unpack ${PN}_${PV}.orig.tar.gz
+	mv ${S}/${P}.tar.gz ${WORKDIR} && rmdir ${S}
+	unpack ./${P}.tar.gz
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${PN}_${PV}-${DEBIAN_PV}.diff.gz
+	for p in ${S}/debian/patches/*; do
+		EPATCH_OPTS="-p1 -d ${S}" epatch ${p}
+	done
+	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-makefile-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
+	echo 'libs: $(LIBHD) $(LIBHD_SO)' >>${S}/Makefile
+}
+
+src_compile(){
+	# build is NOT parallel safe
+	emake -j1 EXTRA_FLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc VERSION README COPYING ChangeLog
+	doman doc/hwinfo.8
+	# this is the SuSE version
+	# somebody needs to port it still
+	rm ${D}/etc/init.d/hwscan
+}