jer 14/09/17 09:47:40 Modified: ChangeLog libkudzu-1.2.57.1.ebuild Log: EAPI bump. perl -> sed. Clean up patches. Simplify setting ARCH. (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.39 sys-libs/libkudzu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libkudzu/ChangeLog?rev=1.39&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libkudzu/ChangeLog?rev=1.39&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libkudzu/ChangeLog?r1=1.38&r2=1.39 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ChangeLog 1 Feb 2013 13:19:01 -0000 1.38 +++ ChangeLog 17 Sep 2014 09:47:40 -0000 1.39 @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/libkudzu -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/ChangeLog,v 1.38 2013/02/01 13:19:01 gmsoft Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/ChangeLog,v 1.39 2014/09/17 09:47:40 jer Exp $ + + 17 Sep 2014; Jeroen Roovers <[email protected]> libkudzu-1.2.57.1.ebuild, + files/kudzu-1.2.57.1-sbusfix.patch, + files/kudzu-1.2.57.1-sparc-keyboard.patch, -files/ppc.patch, + -files/sunlance.patch, -files/typedef_byte.patch: + EAPI bump. perl -> sed. Clean up patches. Simplify setting ARCH. 01 Feb 2013; Guy Martin <[email protected]> libkudzu-1.2.57.1.ebuild: hppa stable 1.17 sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild?r1=1.16&r2=1.17 Index: libkudzu-1.2.57.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libkudzu-1.2.57.1.ebuild 1 Feb 2013 13:19:01 -0000 1.16 +++ libkudzu-1.2.57.1.ebuild 17 Sep 2014 09:47:40 -0000 1.17 @@ -1,8 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild,v 1.16 2013/02/01 13:19:01 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild,v 1.17 2014/09/17 09:47:40 jer Exp $ -inherit eutils toolchain-funcs flag-o-matic +EAPI=5 +inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="Red Hat Hardware detection tools" HOMEPAGE="http://rhlinux.redhat.com/kudzu/"; @@ -13,47 +14,49 @@ KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86" IUSE="zlib" -DEPEND="dev-libs/popt +DEPEND=" + dev-libs/popt + >=sys-apps/pciutils-2.2.4[zlib?] zlib? ( sys-libs/zlib ) - >=sys-apps/pciutils-2.2.4" -RDEPEND="${DEPEND} +" +RDEPEND=" + ${DEPEND} sys-apps/hwdata-gentoo - !sys-apps/kudzu" + !sys-apps/kudzu +" S=${WORKDIR}/kudzu-${PV} -src_unpack() { - unpack ${A} - +src_prepare() { epatch \ "${FILESDIR}"/kudzu-${PV}-sbusfix.patch \ "${FILESDIR}"/kudzu-${PV}-sparc-keyboard.patch } -src_compile() { - tc-export CC - if use zlib - then - perl -pi -e 's| -lpci| -lz -lpci|g' Makefile - elif built_with_use --missing false sys-apps/pciutils zlib - then - die "You need to build with USE=zlib to match sys-apps/pcituils" +src_configure() { + if use zlib; then + sed -i -e 's| -lpci| -lz -lpci|g' Makefile || die fi # Fix the modules directory to match Gentoo layout. - perl -pi -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.* + sed -i -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.* || die - if use ppc && [ "$(tc-arch-kernel)" != "ppc" ]; then - emake libkudzu.a libkudzu_loader.a ARCH="ppc" \ - RPM_OPT_FLAGS="${CFLAGS}" || die - else - emake libkudzu.a libkudzu_loader.a ARCH=$(tc-arch-kernel) \ - RPM_OPT_FLAGS="${CFLAGS}" || die - fi + tc-export CC +} + +src_compile() { + emake \ + $( usex ppc ARCH='ppc' ARCH=$(tc-arch-kernel) ) \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) \ + RPM_OPT_FLAGS="${CFLAGS}" \ + libkudzu.a libkudzu_loader.a } src_install() { - keepdir /etc/sysconfig insinto /usr/include/kudzu doins *.h + dolib.a libkudzu.a libkudzu_loader.a + + keepdir /etc/sysconfig }
