diff options
| author |   Heinrich Wendel <lanius@gentoo.org> | 2005-05-05 18:18:21 +0000 |
|---|---|---|
| committer | Heinrich Wendel <lanius@gentoo.org> | 2005-05-05 18:18:21 +0000 |
| commit | 99a18c820a0cb03796534e0a9cfc12429c5f22f1 (patch) | |
| tree | c050c0c2ed6c913c8d4fb7409a191aaa2131d1ad /app-arch | |
| parent | added wxbase (diff) | |
| download | historical-99a18c820a0cb03796534e0a9cfc12429c5f22f1.tar.gz historical-99a18c820a0cb03796534e0a9cfc12429c5f22f1.tar.bz2 historical-99a18c820a0cb03796534e0a9cfc12429c5f22f1.zip | |
ebuild cleanups; gcc-4 patch
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/dpkg/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/dpkg/Manifest | 11 | ||||
| -rw-r--r-- | app-arch/dpkg/dpkg-1.10.27.ebuild | 13 | ||||
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch | 33 |
4 files changed, 52 insertions, 11 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog index 35fb9552c675..1b32460c066d 100644 --- a/app-arch/dpkg/ChangeLog +++ b/app-arch/dpkg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/dpkg # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.30 2005/05/04 06:24:12 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.31 2005/05/05 18:18:21 lanius Exp $ + + 05 May 2005; Heinrich Wendel <lanius@gentoo.org> + +files/dpkg-1.10.27.gcc4.patch, dpkg-1.10.27.ebuild: + ebuild cleanups; gcc-4 patch *dpkg-1.10.27 (04 May 2005) diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest index aea1a0d6da67..621ba0798840 100644 --- a/app-arch/dpkg/Manifest +++ b/app-arch/dpkg/Manifest @@ -1,17 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3443ca992f50dd814f48e38c4636cef9 dpkg-1.10.27.ebuild 1032 -MD5 6199ed64463fd8f100ac43144bc02452 ChangeLog 3477 +MD5 616641dd379413765b984ef140a1cf49 dpkg-1.10.27.ebuild 1141 +MD5 b16bd28faa2e211425deeca985770c22 ChangeLog 3615 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253 MD5 094be1e966193d5a48b0a18ac2fa949b dpkg-1.10.26.ebuild 1018 MD5 feb5a11111cc715877cc527c979ef699 files/dpkg-1.10.26.patch 840 MD5 3a89ac1e794696a143c8c6665b00cc1d files/digest-dpkg-1.10.26 65 MD5 6316065ab6ab9c129918866cc0c7eec9 files/digest-dpkg-1.10.27 65 +MD5 74ab726dd6bc09fdb24cac5bb933f2f9 files/dpkg-1.10.27.gcc4.patch 1284 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCeGqsevY57Fted3ERAvjVAKCoQ9c2APMAKycFzuR/UEmjdFAxYACeIzM+ -CPlqgC4JBCGY14NOVKAGNo0= -=/72d +iD8DBQFCemOPevY57Fted3ERAubuAJ4gwR5CojKnCRJFwQccrmD+wmABygCffpQt +OglbIuGL8T7W5HlGL+6chpA= +=1IYT -----END PGP SIGNATURE----- diff --git a/app-arch/dpkg/dpkg-1.10.27.ebuild b/app-arch/dpkg/dpkg-1.10.27.ebuild index d93987dd3102..1fc3f3f61335 100644 --- a/app-arch/dpkg/dpkg-1.10.27.ebuild +++ b/app-arch/dpkg/dpkg-1.10.27.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.27.ebuild,v 1.1 2005/05/04 06:24:12 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.27.ebuild,v 1.2 2005/05/05 18:18:21 lanius Exp $ inherit eutils @@ -19,11 +19,14 @@ RDEPEND=">=dev-lang/perl-5.6.0 DEPEND="${RDEPEND} >=sys-devel/gettext-0.11.5" -src_compile() { - cd main - ln -s ../archtable - cd .. +src_unpack() { + unpack ${A} && cd ${S} || die "unpack failed" + ln -s ../archtable main/archtable epatch ${FILESDIR}/${PN}-1.10.26.patch + epatch ${FILESDIR}/${PN}-1.10.27.gcc4.patch +} + +src_compile() { ./configure || die make || die } diff --git a/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch b/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch new file mode 100644 index 000000000000..f248d7565d86 --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch @@ -0,0 +1,33 @@ +--- lib/mlib.c~ 2005-02-10 16:24:17.000000000 +0100 ++++ lib/mlib.c 2005-05-04 16:13:58.000000000 +0200 +@@ -189,7 +189,7 @@ + switch(data->type) { + case BUFFER_WRITE_BUF: + memcpy(data->data.ptr, buf, length); ++ data->data.ptr = (char*)data->data.ptr + length; +- (char*)data->data.ptr += length; + break; + case BUFFER_WRITE_VBUF: + varbufaddbuf((struct varbuf *)data->data.ptr, buf, length); +--- lib/parse.c~ 2005-02-10 16:24:17.000000000 +0100 ++++ lib/parse.c 2005-05-04 16:13:25.000000000 +0200 +@@ -39,7 +39,7 @@ + #include <sys/mman.h> + #endif + ++const struct fieldinfo *fieldinfos = { +-const struct fieldinfo fieldinfos[]= { + /* NB: capitalisation of these strings is important. */ + { "Package", f_name, w_name }, + { "Essential", f_boolean, w_booleandefno, PKGIFPOFF(essential) }, +--- include/parsedump.h~ 2005-02-10 16:24:17.000000000 +0100 ++++ include/parsedump.h 2005-05-04 16:13:36.000000000 +0200 +@@ -30,7 +30,7 @@ + const char *canon; + }; + ++extern const struct fieldinfo *fieldinfos; +-extern const struct fieldinfo fieldinfos[]; + extern const struct nickname nicknames[]; + extern const int nfields; /* = elements in fieldinfos, including the sentinels */ + |