summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-arch/dpkg/ChangeLog8
-rw-r--r--app-arch/dpkg/Manifest12
-rw-r--r--app-arch/dpkg/dpkg-1.16.4.2.ebuild (renamed from app-arch/dpkg/dpkg-1.16.4.1.ebuild)9
3 files changed, 18 insertions, 11 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 6d38280b07d6..b9b9bf2a5f53 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-arch/dpkg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.186 2012/06/09 13:52:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.187 2012/06/10 15:38:31 jer Exp $
+
+*dpkg-1.16.4.2 (10 Jun 2012)
+
+ 10 Jun 2012; Jeroen Roovers <jer@gentoo.org> -dpkg-1.16.4.1.ebuild,
+ +dpkg-1.16.4.2.ebuild:
+ Version bump. Disable failing test by Markus Meier (bug #414095).
*dpkg-1.16.4.1 (09 Jun 2012)
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index b36669ee7e37..071d554031c1 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -9,20 +9,20 @@ DIST dpkg_1.16.1.2.tar.bz2 5347162 RMD160 7f38018b8e4dbb59a2bd14a534f35ace78ff47
DIST dpkg_1.16.1.tar.bz2 5432348 RMD160 dd9d203001073278e397112729cb8d6d126a3ad7 SHA1 9e8176c88fe2b31782ddae6d0a8f599c7e540e8d SHA256 f9363628a6fa1c24a1e9c41bd8977f9d5a7010bfca3ac9a6f8bf500e7e8df52b
DIST dpkg_1.16.2.tar.bz2 5578978 RMD160 7a52df968e65fefa7616315ec7fd350026d7314b SHA1 43ea22771b0dd9eb5bf7ceaf672400e7196a2bea SHA256 53a77f694ce2269f17729b0e9626c59687683703e3822a2624b13da4a10fccc9
DIST dpkg_1.16.3.tar.bz2 5599915 RMD160 7175a4394a48c4a2158cb0f9b0be93c37e74cf11 SHA1 b82a62c1b5e85adcc947f28a264ef7b7ee8580ca SHA256 8048890ca92a3ca317a4fdd557f8e9b2b3ce560743e8e70813496f9a7096d8d8
-DIST dpkg_1.16.4.1.tar.bz2 5616024 RMD160 6676f1685fdfde21753e20838fd0f3b7cf5496cc SHA1 1832de7837bdf2ac2f78d2b40efb29568a39cc32 SHA256 7c9830131a52a9eb4d13276da4e29496fc92335ffc48e25b1e45402f03f99805
+DIST dpkg_1.16.4.2.tar.bz2 5605843 RMD160 91691710742c218be44877cca70e643c50ed1956 SHA1 d41e36b31b58ca6c498eb99e11a260acb167285b SHA256 3862926361b715ac093f23fd7617f47492149d57288cb787cf42e3a2e6f46a7e
EBUILD dpkg-1.16.0.3.ebuild 2639 RMD160 c61fe82ce09cc740d8ecf8c1730995b5e6b031ee SHA1 b26965ea78ae5ab5d5162bdf375b62235afb910f SHA256 fc5054b25c077cdd8448b2c90db014fb705588c34d36ba5b9d9b77212c0eb922
EBUILD dpkg-1.16.1.1.ebuild 2648 RMD160 e21f29609d85bc1e13d483a05ed2c6a96e78b8a5 SHA1 11789d97017ee181a8e1861a54bd4b38b6afdd09 SHA256 9f788a013a82d304342fd798f257efa1994ed0fbaab17fdb0192458a6bda3161
EBUILD dpkg-1.16.1.2.ebuild 2648 RMD160 856992b876b2e006e08f213f60347caaef1852a9 SHA1 fe3e63dc075be90125ed99d2cf697f15ad111167 SHA256 3169cc8506c0c6fb3956094f0af44a44d3a8bbd6e869b300468f07661c27b2a7
EBUILD dpkg-1.16.1.ebuild 2646 RMD160 3ee8058cca5c3aa122e2cb886c0f023f8811a845 SHA1 841650b960d0e3c298e274ae913ff981f55799c5 SHA256 ab9147acd0e8d26e18eed50eacf4136481314b82bf9e1c00b0aa317fa45a8c66
EBUILD dpkg-1.16.2.ebuild 2588 RMD160 70e6e98073c1845303a9d90b5fe138768b130ed9 SHA1 8e55425275d18ce598b95f38d20410cd9b95954a SHA256 25fc8ed9913999a111d02b8df152aa5711ec273989f50a24e852d1c368392e4a
EBUILD dpkg-1.16.3.ebuild 2425 RMD160 418f8bfc148d3feb152779a34616f8dff7df0c6f SHA1 eca18f360788f44cd695a084929bd216e105ffcc SHA256 c75bc053fae9f16d857a4f97f8586a998e8cddc1de9f195c5637ba0098a4151c
-EBUILD dpkg-1.16.4.1.ebuild 2424 RMD160 e9452977b0e4d3b526908971a4bdded5ac9183f9 SHA1 92d2e0670cf7b0b360b0f6cf09b9cc87c97a6473 SHA256 566d5f2bc929f838fac990fd9117c018905059ca9831ea346f6af5b457b252ce
-MISC ChangeLog 24842 RMD160 61e803382bbe54fcd2bcf3488f0803c9350251c4 SHA1 8b3e525ce396a01a2d51dfa81135dc29215b7b4d SHA256 ae8f64f19279675026921b9031493d0cf23a67dd362b67c71020d869f61e8cdb
+EBUILD dpkg-1.16.4.2.ebuild 2434 RMD160 dd1c86c7a68f5c500767f440ca0a6d1647ea0cbf SHA1 73dca2a3b9434541cc169d85131f17f26d8a0afb SHA256 51fab3c8254b2ae0e9078429af7ad477f86722f90e07e78660984bbf6230c08a
+MISC ChangeLog 25036 RMD160 68fc8a8270bbfb1fef2488597e22f798fa2049c6 SHA1 c56ec2b746f3de3cf19756cf955c93c38856765b SHA256 a39bf86c9e14736de728ffb24696fc8cb214aadcef6cb5b9cabd12073c4a02e6
MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk/TVS8ACgkQVWmRsqeSphPfrgCfVUPjsxWD0LXwU1078U2MDSZa
-tCwAniWO2BlbFtZxKHxFSB0HwwpFlkQW
-=6KlO
+iEYEARECAAYFAk/UwDAACgkQVWmRsqeSphM0fQCfbvLrawnMQYTacbf1n8ATUjnn
+I4cAn3Qqh+m5CO02f0iguL7DbY4l0yPx
+=GQw8
-----END PGP SIGNATURE-----
diff --git a/app-arch/dpkg/dpkg-1.16.4.1.ebuild b/app-arch/dpkg/dpkg-1.16.4.2.ebuild
index 8e822aa2c83c..8b89aede9f34 100644
--- a/app-arch/dpkg/dpkg-1.16.4.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.16.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.4.1.ebuild,v 1.1 2012/06/09 13:52:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.4.2.ebuild,v 1.1 2012/06/10 15:38:31 jer Exp $
EAPI=4
@@ -41,9 +41,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="dselect? ( nls )"
src_prepare() {
- # don't mess with linker optimisation, respect user's flags (don't break!)
- sed -i -e '/DPKG_LINKER_OPTIMISATIONS/d' configure.ac || die
-
# Force the use of the running bash for get-version (this file is never
# installed, so no need to worry about hardcoding a temporary bash)
sed -i -e '1c\#!'"${BASH}" get-version || die
@@ -53,6 +50,9 @@ src_prepare() {
sed -i scripts/Makefile.am \
-e '/850_Dpkg_Compression.t/d' \
|| die "sed failed"
+ # test fails (bug #414095)
+ sed -i utils/Makefile.am \
+ -e '/^test_cases/d;/100_update_alternatives/d' || die
eautoreconf
}
@@ -66,6 +66,7 @@ src_configure() {
$(use_with bzip2 bz2) \
$(use_with zlib) \
--disable-compiler-warnings \
+ --disable-compiler-optimisations \
--without-selinux \
--disable-start-stop-daemon
}