| 1 |
abcd 10/02/19 22:18:01 |
| 2 |
|
| 3 |
Modified: ChangeLog dpkg-1.15.5.6-r1.ebuild |
| 4 |
Log: |
| 5 |
Add prefix keywords, bump to EAPI-3, prefix fixes |
| 6 |
(Portage version: -svn/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.118 app-arch/dpkg/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/dpkg/ChangeLog?rev=1.118&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/dpkg/ChangeLog?rev=1.118&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/dpkg/ChangeLog?r1=1.117&r2=1.118 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v |
| 18 |
retrieving revision 1.117 |
| 19 |
retrieving revision 1.118 |
| 20 |
diff -u -r1.117 -r1.118 |
| 21 |
--- ChangeLog 5 Feb 2010 08:18:47 -0000 1.117 |
| 22 |
+++ ChangeLog 19 Feb 2010 22:18:01 -0000 1.118 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for app-arch/dpkg |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.117 2010/02/05 08:18:47 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.118 2010/02/19 22:18:01 abcd Exp $ |
| 28 |
+ |
| 29 |
+ 19 Feb 2010; Jonathan Callen <abcd@g.o> dpkg-1.15.5.6-r1.ebuild: |
| 30 |
+ Add prefix keywords, bump to EAPI-3, prefix fixes |
| 31 |
|
| 32 |
05 Feb 2010; Jeroen Roovers <jer@g.o> -dpkg-1.15.3.ebuild, |
| 33 |
-dpkg-1.15.3.1.ebuild, -dpkg-1.15.4.ebuild, -dpkg-1.15.4.1.ebuild, |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: dpkg-1.15.5.6-r1.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- dpkg-1.15.5.6-r1.ebuild 5 Feb 2010 08:14:53 -0000 1.1 |
| 50 |
+++ dpkg-1.15.5.6-r1.ebuild 19 Feb 2010 22:18:01 -0000 1.2 |
| 51 |
@@ -1,6 +1,8 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild,v 1.1 2010/02/05 08:14:53 jer Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild,v 1.2 2010/02/19 22:18:01 abcd Exp $ |
| 56 |
+ |
| 57 |
+EAPI=3 |
| 58 |
|
| 59 |
inherit eutils multilib autotools |
| 60 |
|
| 61 |
@@ -10,7 +12,7 @@ |
| 62 |
|
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 66 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" |
| 67 |
IUSE="bzip2 nls test unicode zlib" |
| 68 |
|
| 69 |
LANGS="de es fr hu ja pl pt_BR ru sv" |
| 70 |
@@ -27,25 +29,29 @@ |
| 71 |
nls? ( app-text/po4a ) |
| 72 |
test? ( dev-perl/Test-Pod dev-perl/IO-String )" |
| 73 |
|
| 74 |
-src_unpack() { |
| 75 |
- unpack ${A} |
| 76 |
- cd "${S}" |
| 77 |
+src_prepare() { |
| 78 |
epatch "${FILESDIR}"/${PN}-1.15.5-nls.patch |
| 79 |
epatch "${FILESDIR}"/${PN}-1.15.5-unicode.patch |
| 80 |
epatch "${FILESDIR}"/${PN}-1.15.5.6-bootstrap.patch |
| 81 |
+ |
| 82 |
+ # don't mess with linker optimisation, respect user's flags (don't break!) |
| 83 |
+ sed -i -e '/DPKG_LINKER_OPTIMISATIONS/d' configure.ac || die |
| 84 |
+ |
| 85 |
+ # Force the use of the running bash for get-version (this file is never |
| 86 |
+ # installed, so no need to worry about hardcoding a temporary bash) |
| 87 |
+ sed -i -e '1c\#!'"${BASH}" get-version || die |
| 88 |
+ |
| 89 |
eautoreconf |
| 90 |
} |
| 91 |
|
| 92 |
-src_compile() { |
| 93 |
+src_configure() { |
| 94 |
econf \ |
| 95 |
$(use_with bzip2 bz2) \ |
| 96 |
$(use_enable nls) \ |
| 97 |
$(use_enable unicode) \ |
| 98 |
$(use_with zlib) \ |
| 99 |
--without-selinux \ |
| 100 |
- --without-start-stop-daemon \ |
| 101 |
- || die "econf failed" |
| 102 |
- emake || die "emake failed" |
| 103 |
+ --without-start-stop-daemon |
| 104 |
} |
| 105 |
|
| 106 |
src_install() { |
| 107 |
@@ -55,7 +61,7 @@ |
| 108 |
fi |
| 109 |
|
| 110 |
emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install || die "emake install failed" |
| 111 |
- rm "${D}"/usr/sbin/install-info || die "rm install-info failed" |
| 112 |
+ rm "${ED}"/usr/sbin/install-info || die "rm install-info failed" |
| 113 |
dodoc ChangeLog INSTALL THANKS TODO |
| 114 |
keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk} |
| 115 |
keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates} |
Archives