added multilib support (bug #540030)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 96d451b7c8c35a740216e170a68f48ebd4ff49db..d3478c553fb997bc3d6ac2593c9142ee43e32fc8 100644 (file)
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pciutils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.234 2014/12/29 08:25:52 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.235 2015/02/16 02:33:21 ottxor Exp $
+
+*pciutils-3.3.0-r2 (16 Feb 2015)
+
+  16 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +pciutils-3.3.0-r2.ebuild:
+  added multilib support (bug #540030)
 
 *pciutils-3.3.0-r1 (29 Dec 2014)
 

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 5433f6a3e043ab7cd608fcff2002640ca956b17a..898ee6c37f5278b26452a0a952937b73eb69d4a9 100644 (file)
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -10,22 +10,17 @@ DIST pciutils-3.3.0.tar.gz 424967 SHA256 4b576a1c2570046fda83fa2c5488661de698874
 EBUILD pciutils-3.2.0.ebuild 2353 SHA256 1ac7212f396e6c218569cda57684f3248d871742ddcdc0eda9c29c82f211721b SHA512 c1c6960087a88a218ce110b88f3a8345eb76ef9b5fbc438e45f070b2d91724588b0644ad28454accc4b306ebcffb5293ba81063424a42ee62580393f2c2eab05 WHIRLPOOL d69c484efa630c65b6e1aa0a3438ec908145d8d87bf499fd81b603506cac0640e65e1b033350b37935b273c9a5cd9eefb6699b08cbfd9828db3ba77497670c8c
 EBUILD pciutils-3.2.1.ebuild 2373 SHA256 a0e93da5617f00df6f2f3f90c80fc3c35ae585b118098b2d6ebe80922b0f8638 SHA512 a13853ae95a2ba0c7914eac16b2c28270bf9f23050d3c418224334f3910ae9f131b673dc033ac9718fbcec0955325ade03675d07d85097d5b7f64e1e6d51f0eb WHIRLPOOL 5d6d90fe665a69afb4f7c677357d9ea589b56931eae247314e220efe3d45877d7165053345c9b7e1f1850f11507cadd3afaf668987d99b8ffa426da6fe710425
 EBUILD pciutils-3.3.0-r1.ebuild 2573 SHA256 5d77c3580909665f335e178d6612e47a7099d17553757a3a6687a5ca0335e3b7 SHA512 36bbcb6cdc7cc602a6121df2f234b05a5a509a763266729cf3e188de2038ba5d2b07798c7bb57c04cc08dba6a85a03974c89b290e98323abb8212019de9394fb WHIRLPOOL 0fe1322e3b375f66ccc0d4e4aea551406864cdc351cc8f98aa32893a2e72e2c29ff5549716bcb85999d7ac132a40cfb362b0cf34ff434f47ab281472c6eb160f
-MISC ChangeLog 30826 SHA256 f9be40fc8f64978b102c4f964a161a049355d199ea3ba033ee4381d5f61f18d7 SHA512 3d1ef9e2e24b06893a70bd178b21e4caa96bd7b71f7a0400d91ea2b852fcde5113e19b54bb9dc438e4daaf85bae46afaf36ce976bdce9262298bf15cb6a1b3f2 WHIRLPOOL 7548f99dc54e3a4c3ccc18d354398df7fc5949b18c10db88b5e758481f4ea369d59c263dcbb8c0ac5f02cb70699c2fe1bacf52f4412b7115117bfaf8f7f2710b
+EBUILD pciutils-3.3.0-r2.ebuild 2890 SHA256 95fc7367fb9794af3b11ed48cc155202a00f8ef903c13b72527cadeaa66efe64 SHA512 48ba707b767c0db672a0ef5579e3ea8b20f12f3262950cbeff665f36cb2650ac921bd282b064820ba8a29751a7a677d177eec457723910b0ff8eb0c11d9392f3 WHIRLPOOL 0c1ac4ef62b5dd73876b8ae12a1bc0f9673867513480e24b22fad385386770fe36265922f4c227c55a3d175aa4f24e226b9a866213570cceba3668aab830f6c2
+MISC ChangeLog 30975 SHA256 06495dadcc24562aaeef7490c5e2e7a6653ac4af8d7548d3a4c118e2e1fb7fac SHA512 c5cc3cb7d9a38d679f089dcc13ab935f03d00ad3d80ff30c501badfb5f05d3d79ac88170f8978fa9b7ee6eb64a5b1985c83c71de2559062cc20025da60858d08 WHIRLPOOL 87897a5252505c9319393f61d98e94f3789c2d1cd4d6ba059cc1f2669f8402ec411463e32e7423ef60d0063c30c41265bfb1c385719dd6d349cecd8e2f189c5b
 MISC metadata.xml 441 SHA256 3b59e464a347f70ba8253b0dfe68d2782bedcce66d6463cb70ca8d726b51ff7a SHA512 11928700ad20848f7218d6206b65619005d4c9552b0ae65f66ae7d3c21539b2fca664ea46e6d2f47553e3de6e25a5d89e4c9d4eb41fea358016e1549472934e0 WHIRLPOOL 6b8388c472839846d0bf04b8329e71f1acf787c465ff60e1d7abb7717fe717f1cff14e495ec9b6b9de6169b71a7546b22519cd38bcc8472f7090c7a996d2d7ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUoRARAAoJEPiazRVxLXTFIBsP+wW9nZF3NYwIOeASCTLlZUgd
-eNLRns+UTsDnSOnboad4zUIh+7jni2PMg3nGVDQgWJIGMAPAup2q4wo5UbX6YzBC
-VW6p9OlNfC3S137gwYk0TVp/fgDSRnqCFsL50WZ6+bFqGLQnGihy0ls7qDI4LjgF
-BNMeiNr7DxX/QkK9nVJjnv41Hhbnztsbcq85QJDbvqKTpF2oIpWkMMeASL0rmeUv
-ePJvVrgJc7ck5BqSrpaePnTIei1ZnYAumlP/Fm8spWe7qgwFhEQuXDrpJV6bcNCv
-f6Iz41OOcVWDP7GgxT0JMSQAaR/AoYvUK6HiJPlM5pnP6cnhVMcupJ16AvQsfNo1
-qWZsP+W8k3004n353dY57ftzex95T4yiHiA4LMhU4ZzW32/xDjmdUnYDVT9rcSMW
-XThs8CJk60mPhgCj4vXYChoPZM96EfdzMilr01pE8+u+EzHRMgbwd1PStFzPg+H0
-RbAma+ZtCjL5PL2G/gy81JL/tmeD7ZV8Iu/2UzA2w1Wqm4drC/p13ilhbU636UYe
-9bOxFc0l/Iiwm/aA4dB5i+sGUOHehJBsMPSOB6n0e1wHMR2sW3WOJkj4yzKsEgG+
-kMqlgjfsD/Iapt2qZAKD0jKK1orAd0RVgvltN2uh/pxEX+8+i2af29WF4RZkucwh
-CHvSxGX2YbnUxor0ntxj
-=IRbV
+iQEcBAEBCAAGBQJU4Vb0AAoJEOeBhlrCAAWGgIsH/Rba5t0P23n2hL5aiF5t4+9n
+EFqeIZolYmXRnAnrlcweProoajwW9RWjh4eNrNsgjdWYhGQN9qkjF7XXg0jOgMiR
+Tm8AuV3xbvNvg385lpW5wOgjr7mYWsrfzgZd9PFIFKBczLOEGyJRPN1nPKFe/eMX
+pwJPtuwS/Vyt+dCy1N/pTCWYK7BexlVVexK2+GZEeaUw7BhGDZ8RfhdS2nuEFYSJ
+bsh8ph6+h61hcZ7f6kva90o305qvqXoce7bXB3Gp5ziI1h0qRqNEW6DAqWCzkvJG
+6PQ+SfO5pbs9BdvbcZePYiUbaGiIDjfzQsFhN1OBwPNIvfreo6LoIipyrbhSyb8=
+=kH64
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild b/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild
new file mode 100644 (file)
index 0000000..19eb41a
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild,v 1.1 2015/02/16 02:33:21 ottxor Exp $
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
+DEPEND="kmod? ( sys-apps/kmod )
+       static-libs? ( ${LIB_DEPEND} )
+       !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
+       udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+       sys-apps/hwids"
+DEPEND="${DEPEND}
+       kmod? ( virtual/pkgconfig )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+       [[ $# -ne 2 ]] && return 1
+       local opt=$1 val=$2
+
+       sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+       return 0
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+
+       if use static-libs ; then
+               cp -pPR "${S}" "${S}.static" || die
+               mv "${S}.static" "${S}/static" || die
+       fi
+
+       multilib_copy_sources
+}
+
+pemake() {
+       emake \
+               HOST="${CHOST}" \
+               CROSS_COMPILE="${CHOST}-" \
+               CC="$(tc-getCC)" \
+               AR="$(tc-getAR)" \
+               RANLIB="$(tc-getRANLIB)" \
+               DNS=$(usex dns) \
+               IDSDIR='$(SHAREDIR)/misc' \
+               MANDIR='$(SHAREDIR)/man' \
+               PREFIX="${EPREFIX}/usr" \
+               SHARED="yes" \
+               STRIP="" \
+               ZLIB=$(usex zlib) \
+               PCI_COMPRESSED_IDS=0 \
+               PCI_IDS=pci.ids \
+               LIBDIR="\${PREFIX}/$(get_libdir)" \
+               LIBKMOD=$(multilib_native_usex kmod) \
+               HWDB=$(usex udev) \
+               "$@"
+}
+
+multilib_src_compile() {
+       pemake OPT="${CFLAGS}" all
+       if use static-libs ; then
+               pemake \
+                       -C "${BUILD_DIR}/static" \
+                       OPT="${CFLAGS}" \
+                       SHARED="no" \
+                       lib/libpci.a
+       fi
+}
+
+multilib_src_install() {
+       pemake DESTDIR="${D}" install install-lib
+       use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
+       dodoc ChangeLog README TODO
+
+       rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
+               "${ED}"/usr/share/man/man8/update-pciids.8*
+
+       newinitd "${FILESDIR}"/init.d-pciparm pciparm
+       newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+       if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+               elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+               elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+       fi
+}