Remove sys-libs/zlib requirement because we are using shared libpci instead of static libpci so inheriting the libraries (NEEDED entries) work.

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 82 insertions, 17 deletions

diff --git a/xfce-extra/xfce4-cellmodem-plugin/ChangeLog b/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
index 72a93ba7fdc1..5f9c649fedfc 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-cellmodem-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/ChangeLog,v 1.5 2012/05/22 10:54:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/ChangeLog,v 1.6 2012/10/31 20:12:50 ssuominen Exp $
+
+  31 Oct 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-cellmodem-plugin-0.0.5.ebuild,
+  +files/xfce4-cellmodem-plugin-0.0.5-build.patch:
+  Remove sys-libs/zlib requirement because we are using shared libpci instead
+  of static libpci so inheriting the libraries (NEEDED entries) work.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-cellmodem-plugin-0.0.5.ebuild:
diff --git a/xfce-extra/xfce4-cellmodem-plugin/Manifest b/xfce-extra/xfce4-cellmodem-plugin/Manifest
index bfeffe629d31..040a756c7fec 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/Manifest
+++ b/xfce-extra/xfce4-cellmodem-plugin/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX xfce4-cellmodem-plugin-0.0.5-asneeded.patch 329 RMD160 1510fb94453b9824b9661c020ea9adf1f795b0f5 SHA1 4c7af88840bf28d44a07d62f2a81baf7de851737 SHA256 9389113d3bbc92557099d0401d54596d0f9ea706f7f779973aa072d8175da988
-AUX xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch 864 RMD160 f6411f7634ff3dabb0da837814cb040689831f17 SHA1 8d94227b68f761a9ea2156a754865ff47ea0a992 SHA256 f0b30a8d776574d4d010d8fe9e58b9a359359650681712f8492a0756f0fafaa7
-DIST xfce4-cellmodem-plugin-0.0.5.tar.gz 155935 RMD160 79fc2e8f02f30a07f4bd39f56e96589e7ac6cc43 SHA1 abbfd359cf8b6eb7f9ec7a925f934f9e2503f298 SHA256 0debba5007f20382bb7135bd0c37fe6e3075ca8fbc810166d5b5fca26965bdce
-EBUILD xfce4-cellmodem-plugin-0.0.5.ebuild 1107 RMD160 afb232c2e7fa52b240ecb4e0e1b87c9d17316eaa SHA1 284b2b1aa8dada8d4a5f4b8d58fd6dd7a4532c0e SHA256 4409c1fdaeee2836cda0479723fdc72da9dce32c4cac6ac59c130688cac074bf
-MISC ChangeLog 1146 RMD160 e58045bd8243d71ae571f51ee6ebb85b81ef9503 SHA1 e0d8922396e414c5ec8db7c0de20b88d7c8848d5 SHA256 c173f237da2e7a83c03617d32e4c1a27930d7918565ca8a635d6db3ec0ed9793
-MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
+AUX xfce4-cellmodem-plugin-0.0.5-asneeded.patch 329 SHA256 9389113d3bbc92557099d0401d54596d0f9ea706f7f779973aa072d8175da988 SHA512 6aea16f064c0ec86aa88e1adca475ba6da1c66249fd9edf4764d519733db1d56521dee686af254a20b37994cae1b408218cbf1afb3b91b988ce711a3f3822ef4 WHIRLPOOL 80ce5781cd860eb27f21b8d04cb91ef47fddaad55974474972f37efb3f2072266b30c33aefaab86fef9c81a098f125f262e3a3c85c2a9e9535e3b1237ab4621b
+AUX xfce4-cellmodem-plugin-0.0.5-build.patch 1408 SHA256 2159a8716e27ce245b5c125273b17b6bdc4f1e58b4346b97f8e17341b51b8767 SHA512 e97c797f6885c1829d28310aec2b8819c6f754d422db756121175fe18f87812ae1448ad6a0761628c278aac03b26a7e8f7f85526028eab14166fadb09572f30a WHIRLPOOL 9a2dda93d446e3e002489ad55bafe93b4116d523f35d4b2e031a58905c4ba25cf2e80476245a2f488adff4a915a218a293f57c27efe34565162c7d2d441d4dd2
+AUX xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch 864 SHA256 f0b30a8d776574d4d010d8fe9e58b9a359359650681712f8492a0756f0fafaa7 SHA512 29522daf5e822f272d5014019656076d5e400055fcc0ea274181eb599eae739a5598f55fd224aafd10602a2ffb706b0a28335a988682c8b1aca674831424e6ee WHIRLPOOL 5ff2cf358f1b25ab2765060014ee629bf3f28ac6ae6ed765541e0c71cec176aff71233d16500fd15f2a24e6dcf8525785f7b574b694f094d74bfbac0cf7c6c44
+DIST xfce4-cellmodem-plugin-0.0.5.tar.gz 155935 SHA256 0debba5007f20382bb7135bd0c37fe6e3075ca8fbc810166d5b5fca26965bdce SHA512 a59e2b8fa71b490abc99dc9f28e5b147e77538036988ae4c2faa93bc3f7a0187607d486b7eb92580fe2519a31917cbdba5c7312070149340adc417871e8702bd WHIRLPOOL d7e9b47f0265b3e1dc932aa96c81ca929b6add59ec6196c23db57f3525958737d9af6fbd4271b08e0ec5c6ced2f83e5071f337155368c945aabf0c7a1c675763
+EBUILD xfce4-cellmodem-plugin-0.0.5.ebuild 1134 SHA256 ced89297986a86ec48c0b158071644bf99e5cb793fba1c485f9aab770646a815 SHA512 e1cd0b15616c41caa695fe794a2fc916bb9e7a820f74ed82544f3633f9d7f4d721c597ca1f51fd095ea7170a2b0cd4878087684dc17b9df714c19049a6f22282 WHIRLPOOL 39b2d6d30c7e425df2e83030bf487b0b9706507ef7a291f422d1428e694eee26b21be382b1f21cb8c436ef9d8dadbee168f9037e2dba221352a346c6cf0b3e1e
+MISC ChangeLog 1439 SHA256 1343cc390ba665feb303dd746308d94b6d8238c80331ba286f967eb0e3ba9cb7 SHA512 baadd0c7ffc109fead0df8821e0267f25f2d377180afe2009cdbb08f83b9405fa18a72fae5144cfbb5def468a9effb4fc62c5e4c02b39c45b1c3f98853cb38dc WHIRLPOOL bc1ba323e52859e02272f1d99e61211649c768671b72c8afe46b7e5a86300277df9f97875243a0c781e7ce6d799132484849915ac49f9bbb9b5e6484a2465079
+MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPu2+YAAoJEEdUh39IaPFNd00H/iwA4TeBHpasNc9BexiaS20Y
-5oXRcFIKIY2MbP2CWVaFwAydx3cyahyvpOoiOVuuLLsFbSTwPSx5pQFILO+QQurO
-my3Xx9x16/jVvxhlMFJfrkRRRmxF4Yti94CidRgOTwDxh3X6vcAXNPEzGZkiAH8X
-8GhkF3eeyxgbkzWP8PDzMHnQcYGyDOmgFj/GwxO1rmFTDGTvNvyJuKBigaA++2QJ
-1jG6WWfKvnPqodWUIcuSsdRoUiv2pQK2cuPIdmKC8kuYyP626qQTuAa1l8aXuDrA
-UN58KsQaG/QIFVz+7d9wiY+wt1sUfoeqiepOUiG9H8Pjnr/3tVQfm7bRNxFmHYM=
-=09w+
+iQEcBAEBCAAGBQJQkYUnAAoJEEdUh39IaPFNoVwH/1mqcDDOobEminl+1/FaBXLy
+nvkmYM+lXLhXKKjD0pW9ZzSOjFj1y2eIcQ29AIQwP8q0/3Sn3RX8UZZ2wWky0GoQ
+HuKegg/EhDmbrY8dyREOqQZLGNPHJ+rJAln2Krdl6e93BNciL2BrvLIuLPOADZSi
+AmRyB5uMBmk+xvzbfzMajylXKAGVnIFIYMZKPUwdmKryH6yebVOhT2P6YJa7ZMDJ
+RKY1nKveI3bAhKEheUXNOM7vU1j3BntF/f9P6gmJUgxR7FojPOAvJn1vwiIwCo2y
+m7IW8+sxPg50+jmHWXurnp1ITuRTxifT4+MTQPDAXlFtGHQ33DInIXn9mS4jRNA=
+=+6EI
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-build.patch b/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-build.patch
new file mode 100644
index 000000000000..de6b59aa9931
--- /dev/null
+++ b/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-build.patch
@@ -0,0 +1,57 @@
+--- configure.ac
++++ configure.ac
+@@ -14,6 +14,7 @@
+ AC_PROG_INTLTOOL
+ AC_GNU_SOURCE
+ AC_HEADER_STDC
++AC_PROG_MKDIR_P
+ 
+ AC_CHECK_FUNCS([vasprintf])
+ 
+@@ -33,14 +34,6 @@
+   echo "> Not using debug"
+ fi
+ 
+-# PCI library needs libz.
+-
+-AC_CHECK_HEADER([zlib.h],
+-AC_CHECK_LIB(z,inflate,
+-LIBS="$LIBS -lz"
+-)
+-)
+-
+ AC_CHECK_HEADER([pci/pci.h],
+ AC_CHECK_LIB(pci,pci_alloc, 
+ AC_DEFINE(HAVE_PCIUTILS,[1],[Use pci utils to discover devices])
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -37,9 +37,9 @@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+ subdir = po
+ install_sh = @install_sh@
+-# Automake >= 1.8 provides @mkdir_p@.
++# Automake >= 1.8 provides @MKDIR_P@.
+ # Until it can be supposed, use the safe fallback:
+-mkdir_p = $(install_sh) -d
++MKDIR_P = $(install_sh) -d
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -98,7 +98,7 @@
+ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
++	$(MKDIR_P) $(DESTDIR)$(itlocaledir)
+ 	if test -n "$(PO_LINGUAS)"; then \
+ 	  linguas="$(PO_LINGUAS)"; \
+ 	else \
+@@ -106,7 +106,7 @@
+ 	fi; \
+ 	for lang in $$linguas; do \
+ 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+-	  $(mkdir_p) $$dir; \
++	  $(MKDIR_P) $$dir; \
+ 	  if test -r $$lang.gmo; then \
+ 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ 	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
diff --git a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
index 21584faaf524..26765ebb0394 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
+++ b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild,v 1.7 2012/05/22 10:54:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild,v 1.8 2012/10/31 20:12:50 ssuominen Exp $
 
 EAPI=4
 EAUTORECONF=yes
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-RDEPEND="sys-apps/pciutils[zlib]
+RDEPEND="sys-apps/pciutils
 	virtual/libusb:0
 	>=xfce-base/libxfcegui4-4.8
 	>=xfce-base/xfce4-panel-4.8"
@@ -27,6 +27,7 @@ pkg_setup() {
 	PATCHES=(
 		"${FILESDIR}"/${P}-asneeded.patch
 		"${FILESDIR}"/${P}-link_for_xfce_warn.patch
+		"${FILESDIR}"/${P}-build.patch
 		)
 
 	XFCONF=(