Fixing the position of "emake lib" since under certain conditions lspci and friends...

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 702237f492e313b9ce90c2ee0e670974bc5eca49..67561a2a1979ed3cb316d2357bbaf087269997df 100644 (file)
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.36 2004/10/09 08:36:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.37 2004/10/14 21:07:40 plasmaroo Exp $
+
+  14 Oct 2004; <plasmaroo@gentoo.org> pciutils-2.1.11-r3.ebuild:
+  Fixing the position of "emake lib" since under certain conditions lspci and
+  friends get compiled without the /usr/share/misc/pci.ids sed getting run.
 
 *pciutils-2.1.11-r3 (09 Oct 2004)
 

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 2dc70efbab23a74c9c7a96adabad98ea106b7bf4..3ba28a630b4d0e122543f99940d0047c026873c0 100644 (file)
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 07d3f3e9e855bcb455448c1bdddc33ff ChangeLog 5108
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 ce79533e91cb25037d69c041062945a8 pciutils-2.1.11-r1.ebuild 1664
+MD5 d84b02b16fc1ea2fd1ee5a79cf2cf6e0 pciutils-2.1.11-r3.ebuild 1866
 MD5 a715840d9c61913486ef33b98fdf654c pciutils-2.1.11.ebuild 1248
-MD5 4679ff7ac335c0c54b39b68549e96123 pciutils-2.1.11-r3.ebuild 1852
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 21f7f11cb4dd4c8e2b9b2a17389f0820 ChangeLog 4885
 MD5 2380e2fca2ab6252e7520f845c495253 pciutils-2.1.11-r2.ebuild 1770
+MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
 MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r3 67
-MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r1 67
 MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r2 67
-MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11 67
-MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
 MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
 MD5 70f9f6cb767230245ac30ec658b3fd0a files/pciutils-2.1.11-fix-pci-ids-location-refs.patch 925
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZ6L/Fhz/XBeRBtARAtiLAKCBdEjAVTvvaiXtP195QAqbDIvc0wCcDDcY
-fRqU7zuyWFDfEOwLEbAD5kA=
-=BaoW
------END PGP SIGNATURE-----
+MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r1 67
+MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11 67

diff --git a/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
index f2b064d8900b28cde93fb18511df8d3942e13b09..1757385708f135476b67d001af807ebfa9caa46e 100644 (file)
--- a/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild,v 1.1 2004/10/09 08:36:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild,v 1.2 2004/10/14 21:07:40 plasmaroo Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,7 +24,6 @@ src_unpack() {
        epatch ${FILESDIR}/${PV}-sysfs.patch #38645
        epatch ${FILESDIR}/pciutils-2.1.11-fix-pci-ids-location-refs.patch  # bug #62786
 
-
        # Unconditionally use -fPIC for libs (#55238)
        sed -i \
                -e "/^include/s/$/\nCFLAGS+=-fPIC/" lib/Makefile \
@@ -43,14 +42,14 @@ src_unpack() {
 }
 
 src_compile() {
-       emake PREFIX=/usr lib || die "emake lib failed"
-
        cd ${S}/lib
+       ./configure
        sed -i \
                -e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" config.h \
                || die "sed config.h failed"
 
        cd ${S}
+       emake PREFIX=/usr lib || die "emake lib failed"
        emake PREFIX=/usr || die "emake failed"
 
        sed -i \