app-arch/lbzip2: Drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 21 insertions, 217 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index cc3018c0c231..91061c9da219 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/lbzip2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.67 2014/01/26 12:10:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.68 2014/01/27 07:14:05 jlec Exp $
+
+  27 Jan 2014; Justin Lecher <jlec@gentoo.org> -lbzip2-2.2-r1.ebuild,
+  -lbzip2-2.3.ebuild, -files/lbzip2-2.2-assertion.patch,
+  -files/lbzip2-2.2-s_isreg.patch:
+  Drop old
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> lbzip2-2.3-r1.ebuild:
   Stable for sparc, wrt bug #495322
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index d7e8dfeaceef..6b51fd8e7906 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,30 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX lbzip2-2.2-assertion.patch 3445 SHA256 b8604cc0a184fdd3efed02746623d1c29827381e2c659dcc7aab1fa3b6b8f59f SHA512 fa5b6572ffff30650b4917679e178741220f2fea0f6e62e7935839572f92c5f5c2455edc429c790b1d905445a295a541fca23378b5c24296e1a676414692360d WHIRLPOOL 7de49a15e1524e81f776d5e86cadda4a29c793d89d9259c740ca8aeb406099bb0b5f1de8cbd29b81be06911894102dc0244d8b6818c9ddf2d8a063797dd9bdc6
-AUX lbzip2-2.2-s_isreg.patch 456 SHA256 d3564db329d05fde2866a113066e21478ef8c504c3765ac934afbe3e31df00c3 SHA512 5c5c221befa34b50b1cd299608fea4d0871ede7c53a297fe05504ac34b3088378f1734d9e7a1c1649ede44894481786b0c417d38852963606b127090c97b33bb WHIRLPOOL 6a5c6f6d566f8dd4880047fe0f2c49626b07174785715c3cd06e736117133dc23d67020d8cba6b4dd66a013f60ac8da0582af64c08629e2010a29938404219d0
 AUX lbzip2-2.3-s_isreg.patch 500 SHA256 10b815ddb705e8d12a50694174b1c1020a3ac64203ea8c253e6b2a0f0cfe71e0 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04 WHIRLPOOL 94129a224b1b68d0de839aa8d98ba1ccedef41291b4848368c5e2da49af4d0415bda5be594a788c1b19620d791bba8b33549102ce2332e1ab20ca0dea1ec70a2
-DIST lbzip2-2.2.tar.gz 622154 SHA256 b905f763a5859670e36b15d016fb6bb73d6718905fc0e2a9fa1dbc11f30b0d80 SHA512 9b194eee262e44d4665d97307f73f20075c301c2a8fbc0f989805359645387bb3ad0a6b7507edc5463a017eaf7002ee177e9fc00cf808c02c7a9c16e7b58b918 WHIRLPOOL 241c6cf473171be56b94efdc152eecb15482977ed47cb46ed47dad641bca9f73d7ec52f13947677aa619387707d5d17f7fa3421f9bc83fc28ced9e7c49b607d1
 DIST lbzip2-2.3.tar.gz 630226 SHA256 d3110a2b9e19da277dec899f7a3f435cc130a518f6a43094ec4e31ca15f93eaa SHA512 4f694445cc90377bf8dac5046b952ff174db571f390c2d7b0aa001f73c76f3d3f048ff8e7297c2055ed1f7b210174496dc31d6628e1cbeff63146a36a442ad4c WHIRLPOOL 781c9e07eccb633eeb713a9e4f821e0a75102e182d6a6ea4dfba7e33aa96afbfd92fdd5d0e9818ec4c41cf86733fe0396bb42071aad7a47c5e4cdd6426812527
-EBUILD lbzip2-2.2-r1.ebuild 902 SHA256 afa4f1d4729f4e77026565397d2d4f252f294cb29495dcae15e4b0e4b41e0561 SHA512 7370254b4c8030b6907071362f1aebc0bae46665ca5d9c8c854cae5c2510b727c9d428d0e0ff237e9f41c503c102cc92393ea47060f94583db29b2880e49d0b0 WHIRLPOOL d35d923c686cd465a9bf1ed44f487f7cc7ba5cba9cc0af04c2c2bd5c12feabc631b9c8df0df6b15fb0074230d772798f848a4bf53e9efdb5318ae5337a1f8c54
 EBUILD lbzip2-2.3-r1.ebuild 915 SHA256 a46cd599f2da23d04715c232ae2a6679b14f7c100aafcd95f73e9f8bee9c697e SHA512 9d3007bac71c66d16c0326bdf345e9a29c126f6bd8205a65f96d79b5705bf6a442cc6073474100724a4219a9341530647249eeab532817925943cbde16cd0b70 WHIRLPOOL 68c0ad8188765116e55cf10dc05166983f6dd4f4bb628e2b70b4c169a818a70cb5cff12ce94750a1411e8e1749c2a9c1e7115dd0a274694a177221752150c972
-EBUILD lbzip2-2.3.ebuild 872 SHA256 81ac5f6e70e2ef2a7c0aec76f8fb0083de919abd0984d3cd9dc48f0b2c56dfc8 SHA512 d5082b6dbded063ff8cdfa289ac698b3aabf72fda1bc049d0305bb9695a29b7d83ca5fb73713e547c946a5a93130e69f4f7d40280729dc69c09482a2626270ba WHIRLPOOL 25cd2e575f58cc485812d2a5193b83f641b9657500a75872914142ecd7fabc2bbdbd9e32c1cc6eb096713c30171ad2f54c3ba6cbff11d45c20c34c28b6102665
-MISC ChangeLog 8842 SHA256 6ac17c8ba9a2af72d2ada5554555041f4491113acfe62a7c3f0ded9fd6fa9314 SHA512 190223c9758f7469a0a3e6eadebe7081aa1547d2314c51fea214eb9e9d829d8039735482a28fdbc7c324d6189043e24ba830b257db1a744116aba34c8d8547d8 WHIRLPOOL 251f5c36cef936006946d5e7800f3867ce7e7ef4b8e2b6e98694efff8c1ca664438a72a9189c4506cf85ae19aab881e85eba664d858a33051644681bb8f89925
+MISC ChangeLog 9017 SHA256 1de7f40f8c5cf07b2283a45eb87abffa25248e9e0f7469557bc3101a32b30dcd SHA512 9494e1b7f04ab559c3cbeefedee4da238e6f0326086f351c66f64e2953669317fc7ee252fc0e90f36c838cbd446f11bf5acea087292373a160956ec6ee5bb4c1 WHIRLPOOL dc8634a434a97fc5d9d08710edb1d67ff91ee1d25ad87c90aecda9c8341f3b45ef94abefeefc959c9dcfe6c582aeb774fd8310e778f85e3c5546486f5af50d3f
 MISC metadata.xml 517 SHA256 c2248b7afbad927ad1278839f066700d7feb2d0f92d5e39066225a3f391a7127 SHA512 8f3de06520fa4f8f1ff273897be36c870b128c561dc776ef27f34fb4eb15172f0d77b7e004b5d9861f23250e1b23b08b36bc2286fee48875c3ec3e1e0cf79bb2 WHIRLPOOL e5a1c3c4a463146d8d4437ba5b34481ffb4b729f4df52247d6682ed5c02475487be782dbaba4677cc4eac51a734e525f85e0ee1d8b4488a9bc58110b441344f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5PtEAAoJELp701BxlEWfWZcP/jY+1P4IRFQViEah0ivbJBGj
-5BPKo3BnKIuKztdovr7P3/8mr7PuRwa0bCpwMJZrJDfJBfNMccW69P2g0Yk/wMpJ
-zPq4fnAx7P7mOPmK4N5C5uMKnYERMGqezUI5R5z0FqvAzWzumnmcmwTpQYvm9F4d
-9uwIHnrG6lxP4sAJBEKsnXuWCGjl+f4F/EiG+us1ypxkbI924oZQk0SoJaVlWVgD
-yONYNvtdiucqPh9fHeRpQiOJBWuVoK1mzIcHBEBiACVwvt/uSlpnqA1pRLI2iMgb
-mtt05lWiZBDDH7yjJuCyEPUrsRR5Vt1mw79Xw2eBD0Cts/T9RYifmRKHdFm5hBz0
-JOaK4p4+o3I3UjlfAyST6BYG2pX8MZt4q9NslRXLU9GyRvFfBSXR5N/KRp5ykNi9
-hfBXwfg3daFetusrgegoedXdGgGW+lu05Yd1Iyp5rWg5Bju5lcI1ZIRy/Q36wDmF
-7FXYR6SsqDgng34aHer5I3S0vlIwMmHHCFtIqBDD6UPRU/Ev8uDNlbcDhXjGAbYP
-Sxfb+88I7H3QwculZbxcDKBSyXUaQdN6T/1A1mMr0rc0ZjUXfXjg0YPzCIHUGzwq
-jDdFwT8vM6cYSY0Oa7Akt9ZVRbP5MX19stUlOWrj42/UVGXDMX6ctcTGnGuYhGiz
-o/QKWW8XJGQfkVNGAEFd
-=oQox
+iQIcBAEBCgAGBQJS5gc9AAoJELnU8jG9FVirCeYP+QHYRq5jRVBZsTnArXFo4hDM
+MVpVoWkW7wsxVO8ydRy3Dfe51SkIx+TDwBzC52OqTmafqtjoRwCMo9+T3qF1V6ho
+XANazqflgFOdwGESAW6rO0zHiAZUyT8iX8hE2jM3ajOayJZ76/cpYUMIaKRcNXFc
+j9UZk7DAk5Dvnn/hV/ksEpA6kCR6Vud6F3kVK+IBLX+cSiGo6rjeYQetfeqYtTM+
+LqyDu0LiK8yb6dDGWuuiXqf9ew84vf3xdnnmTNJfJG7MkjWpFBK1AUzrHrHmlwxR
+VQ2PdovfSpiwI9TzU4li0U2BdRwvbHL6lxpEw8bll7juGlzhEoQgR6SJhWvTeLhD
+8O9cyfWjTuY7J+1aWgKRCy+d2ZD9YGmCI8ZZFnbxAf2NpQO2A96gsdPmZweZZhD0
+HwNqSqUATIBkyBE4kKWeA3fR0UUm9rzsWlNaIXFaoUJfMUycQ7jIkXRQya7HohMj
+Zo9N6zBQgm3K1wPbneTGj6mbIDb+u/S6i30TPNK+VVqb6HPJ1rag8GInty7wNi1b
+pjMhIciufKVjdufRAIr1dYDExIowBp3zqT16R1b9TFlF4v41cNWJJ/2bKQMWn1Yh
+UPYxbEcbzf69v+j0ZUeUHnQDl5uXt0bN4fa7V4mL8ugOvPLYKiv7sT8mKxU7mWon
+GJ5I8kT5KFYk5i0QMnWP
+=Vwer
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/files/lbzip2-2.2-assertion.patch b/app-arch/lbzip2/files/lbzip2-2.2-assertion.patch
deleted file mode 100644
index b4946175b947..000000000000
--- a/app-arch/lbzip2/files/lbzip2-2.2-assertion.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 57eeee36927f8a40ece1ca06c674e0bd56d0f21f Mon Sep 17 00:00:00 2001
-Message-Id: <57eeee36927f8a40ece1ca06c674e0bd56d0f21f.1358019732.git.jlec@gentoo.org>
-From: Mikolaj Izdebski <zurgunt@gmail.com>
-Date: Sat, 20 Oct 2012 18:37:17 +0200
-Subject: [PATCH] Fix assertion failure, closes #8
-
-src/encode.c (generate_initial_trees): Rewrite from scratch.
----
- src/encode.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 48 insertions(+), 13 deletions(-)
-
-diff --git a/src/encode.c b/src/encode.c
-index 09cfacc..00a78dc 100644
---- a/src/encode.c
-+++ b/src/encode.c
-@@ -763,40 +763,75 @@ assign_codes(uint32_t C[], uint32_t L[], uint8_t B[], uint32_t n)
- 
- /* Create initial mapping of symbols to trees.
- 
--   The goal is to divide all as symbols [0,as) into nt equivalence classes
-+   The goal is to divide all as symbols [0,as) into nt equivalence classes (EC)
-    [0,nt) such that standard deviation of symbol frequencies in classes is
-    minimal. We use a kind of a heuristic to achieve that. There might exist a
-    better way to achieve that, but this one seems to be good (and fast) enough.
- 
-    If the symbol v belongs to the equivalence class t then set s->length[t][v]
-    to zero. Otherwise set it to 1.
--
--   TODO: This piece of code really needs some R&D...
- */
- static void
- generate_initial_trees(struct encoder_state *s, unsigned nm, unsigned nt)
- {
--  unsigned a, b, c, t;
--
--  /* Equivalence classes are empty. */
-+  unsigned a, b;   /* range [a,b) of symbols forming current EC */
-+  unsigned freq;   /* symbol frequency */
-+  unsigned cum;    /* cumulative frequency */
-+  unsigned as;     /* effective alphabet size (alphabet size minus number
-+                      of symbols with frequency equal to zero) */
-+  unsigned t;      /* current tree */
-+
-+  /* Equivalence classes are initially empty. */
-   memset(s->length, 1, sizeof(s->length));
- 
-+  /* Determine effective alphabet size. */
-+  as = 0;
-+  for (a = 0, cum = 0; cum < nm; a++) {
-+    freq = s->lookup[0][a];
-+    cum += freq;
-+    as += min(freq, 1);
-+  }
-+  assert(cum == nm);
-+
-+  /* Bound number of EC by number of symbols. Each EC is non-empty, so number
-+     of symbol EC must be <= number of symbols. */
-+  nt = min(nt, as);
-+
-   /* For each equivalence class: */
--  for (a = 0, t = 0; t < nt; t++) {
-+  a = 0;
-+  for (t = 0; nt > 0; t++, nt--) {
-+    assert(nm > 0);
-+    assert(as >= nt);
-+
-     /* Find a range of symbols which total count is roughly proportional to one
-        nt-th of all values. */
--    for (c = 0, b = a; c * (nt-t) < nm; b++)
--      c += s->lookup[0][b];
--    assert(a < b);
--    if (a < b-1 && (2*c - s->lookup[0][b-1]) * (nt-t) > 2*nm) {
--      c -= s->lookup[0][--b];
-+    freq = s->lookup[0][a];
-+    cum = freq;
-+    as -= min(freq, 1);
-+    b = a+1;
-+    while (as > nt-1 && cum * nt < nm) {
-+      freq = s->lookup[0][b];
-+      cum += freq;
-+      as -= min(freq, 1);
-+      b++;
-     }
--    nm -= c;
-+    if (cum > freq && (2*cum - freq) * nt > 2*nm) {
-+      cum -= freq;
-+      as += min(freq, 1);
-+      b--;
-+    }
-+    assert(a < b);
-+    assert(cum > 0);
-+    assert(cum <= nm);
-+    assert(as >= nt-1);
-+    Trace(("Tree %u: EC=[%3u,%3u), |EC|=%3u, cum=%6u", t, a, b, b-a, cum));
- 
-     /* Now [a,b) is our range -- assign it to equivalence class t. */
-     bzero(&s->length[t][a], b - a);
-     a = b;
-+    nm -= cum;
-   }
-+  assert(as == 0);
-   assert(nm == 0);
- }
- 
--- 
-1.8.1
-
diff --git a/app-arch/lbzip2/files/lbzip2-2.2-s_isreg.patch b/app-arch/lbzip2/files/lbzip2-2.2-s_isreg.patch
deleted file mode 100644
index c67b134b5795..000000000000
--- a/app-arch/lbzip2/files/lbzip2-2.2-s_isreg.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/main.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index f030fd5..5f8290e 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -702,7 +702,7 @@ input_init(const struct arg *operand, struct stat *sbuf)
-       return -1;
-     }
- 
--    if (!S_ISREG(sbuf->st_mode)) {
-+    if (!decompress && !S_ISREG(sbuf->st_mode)) {
-       warn("skipping \"%s\": not a regular file", operand->val);
-       return -1;
-     }
diff --git a/app-arch/lbzip2/lbzip2-2.2-r1.ebuild b/app-arch/lbzip2/lbzip2-2.2-r1.ebuild
deleted file mode 100644
index 0ed9305c387c..000000000000
--- a/app-arch/lbzip2/lbzip2-2.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2-r1.ebuild,v 1.12 2013/06/02 08:37:27 ago Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Parallel bzip2 utility"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-SRC_URI="mirror://github/kjn/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug symlink"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-s_isreg.patch
-	"${FILESDIR}"/${P}-assertion.patch
-	)
-
-RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
-DEPEND=""
-
-src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules
-		$(use_enable debug tracing)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	use symlink && dosym ${PN} /usr/bin/bzip2
-}
diff --git a/app-arch/lbzip2/lbzip2-2.3.ebuild b/app-arch/lbzip2/lbzip2-2.3.ebuild
deleted file mode 100644
index c45db5b54ec9..000000000000
--- a/app-arch/lbzip2/lbzip2-2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.3.ebuild,v 1.1 2013/09/23 11:18:45 jlec Exp $
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Parallel bzip2 utility"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug symlink"
-
-PATCHES=( "${FILESDIR}"/${P}-s_isreg.patch )
-
-RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
-DEPEND=""
-
-src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules
-		$(use_enable debug tracing)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	use symlink && dosym ${PN} /usr/bin/bzip2
-}