ottxor 15/02/16 02:33:21 Modified: ChangeLog Added: pciutils-3.3.0-r2.ebuild Log: added multilib support (bug #540030) (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.235 sys-apps/pciutils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/ChangeLog?rev=1.235&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/ChangeLog?rev=1.235&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/ChangeLog?r1=1.234&r2=1.235 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- ChangeLog 29 Dec 2014 08:25:52 -0000 1.234 +++ ChangeLog 16 Feb 2015 02:33:21 -0000 1.235 @@ -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 <[email protected]> +pciutils-3.3.0-r2.ebuild: + added multilib support (bug #540030) *pciutils-3.3.0-r1 (29 Dec 2014) 1.1 sys-apps/pciutils/pciutils-3.3.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild?rev=1.1&content-type=text/plain Index: pciutils-3.3.0-r2.ebuild =================================================================== # 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 }
