Bug #163057 - compile fix for zlib'd pciutils. Also fix compile on ppc for in/out/ioperm usage.

Package-Manager: portage-2.1.3_rc8

4 files changed, 59 insertions, 11 deletions

diff --git a/app-misc/ddccontrol/ChangeLog b/app-misc/ddccontrol/ChangeLog
index 31e76ce7f469..cb8ff4d40f6f 100644
--- a/app-misc/ddccontrol/ChangeLog
+++ b/app-misc/ddccontrol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/ddccontrol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.16 2007/03/01 15:24:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.17 2007/07/15 07:44:37 robbat2 Exp $
+
+  15 Jul 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ddccontrol-0.4.2-pciutils-libz.patch, ddccontrol-0.4.2.ebuild:
+  Bug #163057 - compile fix for zlib'd pciutils. Also fix compile on ppc for
+  in/out/ioperm usage.
 
   01 Mar 2007; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Add metadata.xml note that upstream wishes to be CCd on all bugs for this
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 3a8d68fd6782..ddfc76cfdf39 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -6,6 +6,10 @@ AUX ddccontrol-0.3-u64-conflicting-types.patch 488 RMD160 dc582418e51b53692c4089
 MD5 1ab2b7f6bb857f6a612b7186b741b5cc files/ddccontrol-0.3-u64-conflicting-types.patch 488
 RMD160 dc582418e51b53692c408958c713a1b5ea7b2cd8 files/ddccontrol-0.3-u64-conflicting-types.patch 488
 SHA256 f460d99e18ebdaa053a7e962fe4bd121450649c10bba550653228bfad60eb3e4 files/ddccontrol-0.3-u64-conflicting-types.patch 488
+AUX ddccontrol-0.4.2-pciutils-libz.patch 1016 RMD160 46874251ba5ef81193007a2486f656b76f230c69 SHA1 c8a6a021dcb1e00351de0fb8bbe8b115f6cf164c SHA256 014568b96f9450805e012d7dc5b0df0c4d3922694da4ad143bb96d429303fb9b
+MD5 5c6a952ace317d5c4da5d7f3790b3436 files/ddccontrol-0.4.2-pciutils-libz.patch 1016
+RMD160 46874251ba5ef81193007a2486f656b76f230c69 files/ddccontrol-0.4.2-pciutils-libz.patch 1016
+SHA256 014568b96f9450805e012d7dc5b0df0c4d3922694da4ad143bb96d429303fb9b files/ddccontrol-0.4.2-pciutils-libz.patch 1016
 AUX ddccontrol-asneeded.patch 582 RMD160 ef37e0676935d4342057eb1e1baf9eb5072a1d8e SHA1 3b476bd315985d82d7c1bc413cbe44a045a09ae8 SHA256 35e3abd8e73f9febb480ccb42a0c0fd1c404ee91a6d04713da3541901cc360bd
 MD5 ee5da560c7038f4bbad7b50af3e4b831 files/ddccontrol-asneeded.patch 582
 RMD160 ef37e0676935d4342057eb1e1baf9eb5072a1d8e files/ddccontrol-asneeded.patch 582
@@ -39,14 +43,14 @@ EBUILD ddccontrol-0.4.1.ebuild 1477 RMD160 ae787f0a3272558bfcf70447ba08b01b65c6d
 MD5 8a2202ed73b4e378e08121a98e6a1c46 ddccontrol-0.4.1.ebuild 1477
 RMD160 ae787f0a3272558bfcf70447ba08b01b65c6d0f8 ddccontrol-0.4.1.ebuild 1477
 SHA256 6aa694fc26301497660550d138af153ba5d137d39b6d167eb1ceb9220aa8b323 ddccontrol-0.4.1.ebuild 1477
-EBUILD ddccontrol-0.4.2.ebuild 1526 RMD160 1f41598f0f682819d45015bb7ac05559fcc816fa SHA1 9d04467f454fceb09ab38eab110692e9c28a9cf4 SHA256 da987efa2ebb60a91909e115cd0671aaffe741ce3d419d3f86d018263423719b
-MD5 9b6b92e91dd5f86d1d9eab49a28527e8 ddccontrol-0.4.2.ebuild 1526
-RMD160 1f41598f0f682819d45015bb7ac05559fcc816fa ddccontrol-0.4.2.ebuild 1526
-SHA256 da987efa2ebb60a91909e115cd0671aaffe741ce3d419d3f86d018263423719b ddccontrol-0.4.2.ebuild 1526
-MISC ChangeLog 2649 RMD160 13c4ceb6458dd455b568b39358b7fce5718eb4ab SHA1 21c78fdad7c6d44cc71f327e194e7df052783a5c SHA256 5fa7485ecbefea8361926841bc5bfd79a552404497479dd0b5b3037a60127cf9
-MD5 3f0be94d75f9a1453c832e4e6cb6311c ChangeLog 2649
-RMD160 13c4ceb6458dd455b568b39358b7fce5718eb4ab ChangeLog 2649
-SHA256 5fa7485ecbefea8361926841bc5bfd79a552404497479dd0b5b3037a60127cf9 ChangeLog 2649
+EBUILD ddccontrol-0.4.2.ebuild 2009 RMD160 0a3bc7af53d52db8f2adc1a9c77fa60327448734 SHA1 22b8ca3c199114fd269d947157ebde9be6c67530 SHA256 b5af93e1f997e1715f888c20999265828e369f277018d92f1577055cd6359d6c
+MD5 236b2a05fe2bcb6943f78caa803c746a ddccontrol-0.4.2.ebuild 2009
+RMD160 0a3bc7af53d52db8f2adc1a9c77fa60327448734 ddccontrol-0.4.2.ebuild 2009
+SHA256 b5af93e1f997e1715f888c20999265828e369f277018d92f1577055cd6359d6c ddccontrol-0.4.2.ebuild 2009
+MISC ChangeLog 2875 RMD160 042fec07f83068d6f4bce479e36f2361be1795b3 SHA1 aff23c5171eb84fe78de7dcb962482dcc8059bc7 SHA256 2a97e638b17cd82234e4e998e97f302b1799d96d20caddd07730ccb0e0dc236f
+MD5 163ee05baf251fc1e825fbf7e8ff10cb ChangeLog 2875
+RMD160 042fec07f83068d6f4bce479e36f2361be1795b3 ChangeLog 2875
+SHA256 2a97e638b17cd82234e4e998e97f302b1799d96d20caddd07730ccb0e0dc236f ChangeLog 2875
 MISC metadata.xml 402 RMD160 0ada1c4f1511ca269fc62c07b064ea0845b4f34a SHA1 98a837d6d20cffdfe79a8c036faa00d2db687960 SHA256 d87db02bd522dfe349f3ff48dd7cae9951684859fc7a8e78bf71154e10ec015e
 MD5 f263ec8c7d1a3038a43bc9f978f187ed metadata.xml 402
 RMD160 0ada1c4f1511ca269fc62c07b064ea0845b4f34a metadata.xml 402
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild
index ff8d7afddc32..0a8d087a3323 100644
--- a/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild
+++ b/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild,v 1.2 2007/01/04 08:27:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2.ebuild,v 1.3 2007/07/15 07:44:37 robbat2 Exp $
 
 inherit eutils autotools
 
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-pciutils-libz.patch
 
 	# Fix sandbox violation
 	for i in Makefile.am Makefile.in; do
@@ -38,8 +39,27 @@ src_unpack() {
 		|| die "Failed to fix DESTDIR"
 	done
 
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if [ "${ARCH/64}" == "ppc" ]; then
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.in
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.am
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c
+	fi
+
 	## Save for a rainy day or future patching
-	##eautoreconf || die "eautoreconf failed"
+	eautoreconf || die "eautoreconf failed"
 }
 
 src_compile() {
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch
new file mode 100644
index 000000000000..8fb602000335
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch
@@ -0,0 +1,19 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/ddccontrol/ddccontrol/configure.ac,v
+retrieving revision 1.40
+diff -u -r1.40 configure.ac
+--- configure.ac	26 Jul 2006 22:02:15 -0000	1.40
++++ configure.ac	1 Mar 2007 14:49:35 -0000
+@@ -101,7 +101,10 @@
+ DDCPCI=
+ if test x$support_ddcpci = xyes; then
+    AC_CHECK_HEADERS([pci/pci.h], [], [AC_MSG_ERROR([PCI utils headers not found, please install pci-utils.], [1])], [])
+-   AC_CHECK_LIB([pci], [pci_alloc], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])])
++   AC_CHECK_LIB([pci], [pci_alloc], [], [
++      AC_CHECK_LIB([z], [gzopen], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])])
++      AC_CHECK_LIB([pci], [pci_fill_info], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])], [-lz])
++   ])
+    DDCPCI=ddcpci
+    AC_DEFINE_UNQUOTED(HAVE_DDCPCI, 1, [Define if ddccontrol is built with ddcpci support.])
+ fi