Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/pciutils: ChangeLog pciutils-2.2.7-r1.ebuild pciutils-2.2.6-r2.ebuild
Date: Fri, 02 Nov 2007 21:40:25
Message-Id: E1Io4FY-0001e5-I8@stork.gentoo.org
1 robbat2 07/11/02 21:40:20
2
3 Modified: ChangeLog
4 Added: pciutils-2.2.7-r1.ebuild pciutils-2.2.6-r2.ebuild
5 Log:
6 Backport the HAL-zlib Gentoo patch from 2.2.8 to the other unstable ebuilds.
7 (Portage version: 2.1.3.16)
8
9 Revision Changes Path
10 1.113 sys-apps/pciutils/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/ChangeLog?rev=1.113&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/ChangeLog?rev=1.113&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/ChangeLog?r1=1.112&r2=1.113
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v
19 retrieving revision 1.112
20 retrieving revision 1.113
21 diff -u -r1.112 -r1.113
22 --- ChangeLog 2 Nov 2007 21:25:49 -0000 1.112
23 +++ ChangeLog 2 Nov 2007 21:40:20 -0000 1.113
24 @@ -1,6 +1,13 @@
25 # ChangeLog for sys-apps/pciutils
26 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.112 2007/11/02 21:25:49 robbat2 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.113 2007/11/02 21:40:20 robbat2 Exp $
29 +
30 +*pciutils-2.2.7-r1 (02 Nov 2007)
31 +*pciutils-2.2.6-r2 (02 Nov 2007)
32 +
33 + 02 Nov 2007; Robin H. Johnson <robbat2@g.o>
34 + +pciutils-2.2.6-r2.ebuild, +pciutils-2.2.7-r1.ebuild:
35 + Backport the HAL-zlib Gentoo patch from 2.2.8 to the other unstable ebuilds.
36
37 *pciutils-2.2.8 (02 Nov 2007)
38
39
40
41
42 1.1 sys-apps/pciutils/pciutils-2.2.7-r1.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/pciutils-2.2.7-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/pciutils-2.2.7-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: pciutils-2.2.7-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2007 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.7-r1.ebuild,v 1.1 2007/11/02 21:40:20 robbat2 Exp $
52
53 inherit eutils flag-o-matic toolchain-funcs multilib
54
55 DESCRIPTION="Various utilities dealing with the PCI bus"
56 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
57 SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
58
59 LICENSE="GPL-2"
60 SLOT="0"
61 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
62 IUSE="network-cron zlib"
63
64 DEPEND="zlib? ( sys-libs/zlib )"
65
66 src_unpack() {
67 unpack ${A}
68 cd "${S}"
69 epatch "${FILESDIR}"/${PN}-2.2.7-build.patch
70 epatch "${FILESDIR}"/pcimodules-${PN}-2.2.6.patch
71 epatch "${FILESDIR}"/${PN}-2.2.6-link.patch #160421
72 epatch "${FILESDIR}"/${PN}-2.2.4-update-pciids.patch
73 epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
74 sed -i "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
75 }
76
77 src_compile() {
78 export ZLIB=$(use zlib && echo yes || echo no)
79 tc-export AR CC RANLIB
80 emake OPT="${CFLAGS}" || die "emake failed"
81 }
82
83 src_install() {
84 emake install install-lib DESTDIR="${D}" || die
85
86 if use network-cron; then
87 exeinto /etc/cron.monthly
88 newexe "${FILESDIR}"/pciutils.cron update-pciids \
89 || die "Failed to install update cronjob"
90 fi
91 # Install both forms until HAL has migrated
92 sharedir="${D}"/usr/share/misc
93 if use zlib; then
94 elog "Providing a backwards compatability non-compressed pci.ids"
95 gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
96 fi
97 }
98
99
100
101 1.1 sys-apps/pciutils/pciutils-2.2.6-r2.ebuild
102
103 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/pciutils-2.2.6-r2.ebuild?rev=1.1&view=markup
104 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/pciutils-2.2.6-r2.ebuild?rev=1.1&content-type=text/plain
105
106 Index: pciutils-2.2.6-r2.ebuild
107 ===================================================================
108 # Copyright 1999-2007 Gentoo Foundation
109 # Distributed under the terms of the GNU General Public License v2
110 # $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.6-r2.ebuild,v 1.1 2007/11/02 21:40:20 robbat2 Exp $
111
112 inherit eutils flag-o-matic toolchain-funcs multilib
113
114 DESCRIPTION="Various utilities dealing with the PCI bus"
115 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
116 SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
117
118 LICENSE="GPL-2"
119 SLOT="0"
120 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
121 IUSE="network-cron zlib"
122
123 DEPEND="zlib? ( sys-libs/zlib )"
124
125 src_unpack() {
126 unpack ${A}
127 cd "${S}"
128 epatch "${FILESDIR}"/${PN}-2.2.3-build.patch
129 epatch "${FILESDIR}"/pcimodules-${PN}-2.2.6.patch
130 epatch "${FILESDIR}"/${PN}-2.2.6-link.patch #160421
131 epatch "${FILESDIR}"/${PN}-2.2.4-update-pciids.patch
132 epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
133 epatch "${FILESDIR}"/${PN}-2.2.6-alloca.patch
134 sed -i "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
135 }
136
137 src_compile() {
138 export ZLIB=$(use zlib && echo yes || echo no)
139 tc-export AR CC RANLIB
140 emake OPT="${CFLAGS}" || die "emake failed"
141 }
142
143 src_install() {
144 emake install install-lib DESTDIR="${D}" || die
145
146 if use network-cron; then
147 exeinto /etc/cron.monthly
148 newexe "${FILESDIR}"/pciutils.cron update-pciids \
149 || die "Failed to install update cronjob"
150 fi
151 # Install both forms until HAL has migrated
152 sharedir="${D}"/usr/share/misc
153 if use zlib; then
154 elog "Providing a backwards compatability non-compressed pci.ids"
155 gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
156 fi
157 }
158
159
160
161 --
162 gentoo-commits@g.o mailing list