Backport the HAL-zlib Gentoo patch from 2.2.8 to the other unstable ebuilds.

Package-Manager: portage-2.1.3.16

6 files changed, 131 insertions, 5 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index d325de974ff0..b30e99399d14 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.112 2007/11/02 21:25:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.113 2007/11/02 21:40:20 robbat2 Exp $
+
+*pciutils-2.2.7-r1 (02 Nov 2007)
+*pciutils-2.2.6-r2 (02 Nov 2007)
+
+  02 Nov 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +pciutils-2.2.6-r2.ebuild, +pciutils-2.2.7-r1.ebuild:
+  Backport the HAL-zlib Gentoo patch from 2.2.8 to the other unstable ebuilds.
 
 *pciutils-2.2.8 (02 Nov 2007)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 608f72412ab1..1b1b2a26040b 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -59,6 +59,14 @@ EBUILD pciutils-2.2.6-r1.ebuild 1434 RMD160 797e28418d0f9791208220969fe8701862db
 MD5 df3816838ddc26913201d9ab5a31a79d pciutils-2.2.6-r1.ebuild 1434
 RMD160 797e28418d0f9791208220969fe8701862dbba0e pciutils-2.2.6-r1.ebuild 1434
 SHA256 55ccb2b10aa44559818300881d27ecaf0b690e79d170eb08d8e1985e8b3ada9c pciutils-2.2.6-r1.ebuild 1434
+EBUILD pciutils-2.2.6-r2.ebuild 1647 RMD160 e61929dc813f0bb571d140dbc079043be9d10621 SHA1 d79b91447e2c44b2a9db2000a517acf1ea5bebd8 SHA256 20e3b5212ba016a7a670ecd5f4eb6882001453494bd55af95124197fd5eb1a31
+MD5 0261d6a48b7ded706b19b2dc74744430 pciutils-2.2.6-r2.ebuild 1647
+RMD160 e61929dc813f0bb571d140dbc079043be9d10621 pciutils-2.2.6-r2.ebuild 1647
+SHA256 20e3b5212ba016a7a670ecd5f4eb6882001453494bd55af95124197fd5eb1a31 pciutils-2.2.6-r2.ebuild 1647
+EBUILD pciutils-2.2.7-r1.ebuild 1600 RMD160 54389ba631710f922edc8e3c8ddb5cba0cc8411d SHA1 1e2edcee9cc2b1418e16fc47851d527f411eb01f SHA256 e60ed192c3d0df2c2e77c922496bba45fadb3b5b091180cf75a49480f1469109
+MD5 423e6807dda6593ea0fa6172bbb52b12 pciutils-2.2.7-r1.ebuild 1600
+RMD160 54389ba631710f922edc8e3c8ddb5cba0cc8411d pciutils-2.2.7-r1.ebuild 1600
+SHA256 e60ed192c3d0df2c2e77c922496bba45fadb3b5b091180cf75a49480f1469109 pciutils-2.2.7-r1.ebuild 1600
 EBUILD pciutils-2.2.7.ebuild 1382 RMD160 941527a62f2fd19620b9c7411cadb5d1aba66ae1 SHA1 7359b11966730655dd4db592a8f355aecac8b583 SHA256 7b0537317644c5772b095582a8b07614400560d4c84e12c614506e20f16a1ad5
 MD5 d525c7ad81d741fb845339a141910391 pciutils-2.2.7.ebuild 1382
 RMD160 941527a62f2fd19620b9c7411cadb5d1aba66ae1 pciutils-2.2.7.ebuild 1382
@@ -67,10 +75,10 @@ EBUILD pciutils-2.2.8.ebuild 1597 RMD160 a2977919f0c9c42d6ba1bda46fac5af5aeb9383
 MD5 734112491fe207457fe3443ddcf66e4d pciutils-2.2.8.ebuild 1597
 RMD160 a2977919f0c9c42d6ba1bda46fac5af5aeb9383c pciutils-2.2.8.ebuild 1597
 SHA256 fa77e78380c2827cd748a55c70c1b0b2381f179303e2aacb03a0d867988207c2 pciutils-2.2.8.ebuild 1597
-MISC ChangeLog 15069 RMD160 054eb3c0b836de2f9b24194df889c5ca124db136 SHA1 a7acb5db49501f384096e8c59edf7e917867cd3d SHA256 0a1694ed45083c23a9900f0e7aa86159b443134ac847f75203ba7664e7de8a04
-MD5 e1452e660a3af48758d48193a648d37c ChangeLog 15069
-RMD160 054eb3c0b836de2f9b24194df889c5ca124db136 ChangeLog 15069
-SHA256 0a1694ed45083c23a9900f0e7aa86159b443134ac847f75203ba7664e7de8a04 ChangeLog 15069
+MISC ChangeLog 15325 RMD160 d7a45bd952ca9289662a922cabbd87045c15d37f SHA1 93661726b48835bb1fa29d5651097cd76eccb678 SHA256 bf048b94519c34f10147235be09736a7ede84e6d074020a9b941325c7fbda144
+MD5 f34c9067eb942c70f9532d6d8a41daa4 ChangeLog 15325
+RMD160 d7a45bd952ca9289662a922cabbd87045c15d37f ChangeLog 15325
+SHA256 bf048b94519c34f10147235be09736a7ede84e6d074020a9b941325c7fbda144 ChangeLog 15325
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -84,9 +92,15 @@ SHA256 ae83c0072554b83b7519828f5470144cfa69ca5605ed319117d5400896258701 files/di
 MD5 c0e80db417149bdc1a4715bb0e1a241c files/digest-pciutils-2.2.6-r1 244
 RMD160 4f0e0ce21dcdad6030e9430ad759638772403ce6 files/digest-pciutils-2.2.6-r1 244
 SHA256 fc18c3f1d11767824326e47279a1b087a9324a8ed2d4e5eedb44397a5e487206 files/digest-pciutils-2.2.6-r1 244
+MD5 c0e80db417149bdc1a4715bb0e1a241c files/digest-pciutils-2.2.6-r2 244
+RMD160 4f0e0ce21dcdad6030e9430ad759638772403ce6 files/digest-pciutils-2.2.6-r2 244
+SHA256 fc18c3f1d11767824326e47279a1b087a9324a8ed2d4e5eedb44397a5e487206 files/digest-pciutils-2.2.6-r2 244
 MD5 0916aab29fe8c5dc3ab1e51bb491a25c files/digest-pciutils-2.2.7 244
 RMD160 35dc6165ecdabd69505860ac9a6b8d8856f9edd4 files/digest-pciutils-2.2.7 244
 SHA256 14797c58675249f39ca67aab2cb3028cbbb5c09e943206f7e0a90a5b6d673fb6 files/digest-pciutils-2.2.7 244
+MD5 0916aab29fe8c5dc3ab1e51bb491a25c files/digest-pciutils-2.2.7-r1 244
+RMD160 35dc6165ecdabd69505860ac9a6b8d8856f9edd4 files/digest-pciutils-2.2.7-r1 244
+SHA256 14797c58675249f39ca67aab2cb3028cbbb5c09e943206f7e0a90a5b6d673fb6 files/digest-pciutils-2.2.7-r1 244
 MD5 1ef4d997f68c1700ea4ef589b17eef2c files/digest-pciutils-2.2.8 244
 RMD160 5c1f0017fa811387c53466d8cc6843784d746907 files/digest-pciutils-2.2.8 244
 SHA256 c8da5762580bd4b9457c73a23b50623fe98a143710af9492f98263ead714f2ee files/digest-pciutils-2.2.8 244
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.6-r2 b/sys-apps/pciutils/files/digest-pciutils-2.2.6-r2
new file mode 100644
index 000000000000..efee508018c5
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.2.6-r2
@@ -0,0 +1,3 @@
+MD5 e26593ab38ef9ae4457826be9e35aff8 pciutils-2.2.6.tar.gz 226049
+RMD160 9f184affb481e51ca59134f5fd72259cf5e16298 pciutils-2.2.6.tar.gz 226049
+SHA256 30019fa23996429d3bedaa1b30e32b9ddcd2eaa4fe39ec015d533af6afc0ee6b pciutils-2.2.6.tar.gz 226049
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.7-r1 b/sys-apps/pciutils/files/digest-pciutils-2.2.7-r1
new file mode 100644
index 000000000000..10b9e48aa092
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.2.7-r1
@@ -0,0 +1,3 @@
+MD5 0fd75a5df05100f60fb3c5498d523160 pciutils-2.2.7.tar.gz 229424
+RMD160 5d334078572cde947da0a33158733c8d64cdd578 pciutils-2.2.7.tar.gz 229424
+SHA256 3c8536fd30d3288b1baffc75ae0521dfeed6eb72a27d800992d1bfabcc8b2441 pciutils-2.2.7.tar.gz 229424
diff --git a/sys-apps/pciutils/pciutils-2.2.6-r2.ebuild b/sys-apps/pciutils/pciutils-2.2.6-r2.ebuild
new file mode 100644
index 000000000000..0479180a7ef8
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.2.6-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.6-r2.ebuild,v 1.1 2007/11/02 21:40:20 robbat2 Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="network-cron zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.2.3-build.patch
+	epatch "${FILESDIR}"/pcimodules-${PN}-2.2.6.patch
+	epatch "${FILESDIR}"/${PN}-2.2.6-link.patch #160421
+	epatch "${FILESDIR}"/${PN}-2.2.4-update-pciids.patch
+	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
+	epatch "${FILESDIR}"/${PN}-2.2.6-alloca.patch
+	sed -i "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+src_compile() {
+	export ZLIB=$(use zlib && echo yes || echo no)
+	tc-export AR CC RANLIB
+	emake OPT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake install install-lib DESTDIR="${D}" || die
+
+	if use network-cron; then
+		exeinto /etc/cron.monthly
+		newexe "${FILESDIR}"/pciutils.cron update-pciids \
+			|| die "Failed to install update cronjob"
+	fi
+	# Install both forms until HAL has migrated
+	sharedir="${D}"/usr/share/misc
+	if use zlib; then
+		elog "Providing a backwards compatability non-compressed pci.ids"
+		gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
+	fi
+}
diff --git a/sys-apps/pciutils/pciutils-2.2.7-r1.ebuild b/sys-apps/pciutils/pciutils-2.2.7-r1.ebuild
new file mode 100644
index 000000000000..82729dc286cb
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.2.7-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.7-r1.ebuild,v 1.1 2007/11/02 21:40:20 robbat2 Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="network-cron zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.2.7-build.patch
+	epatch "${FILESDIR}"/pcimodules-${PN}-2.2.6.patch
+	epatch "${FILESDIR}"/${PN}-2.2.6-link.patch #160421
+	epatch "${FILESDIR}"/${PN}-2.2.4-update-pciids.patch
+	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
+	sed -i "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+src_compile() {
+	export ZLIB=$(use zlib && echo yes || echo no)
+	tc-export AR CC RANLIB
+	emake OPT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake install install-lib DESTDIR="${D}" || die
+
+	if use network-cron; then
+		exeinto /etc/cron.monthly
+		newexe "${FILESDIR}"/pciutils.cron update-pciids \
+			|| die "Failed to install update cronjob"
+	fi
+	# Install both forms until HAL has migrated
+	sharedir="${D}"/usr/share/misc
+	if use zlib; then
+		elog "Providing a backwards compatability non-compressed pci.ids"
+		gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
+	fi
+}