app-arch/lbzip2: Version Bump; clean old patches

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

8 files changed, 78 insertions, 107 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index 5151fb0c26ee..f7f19a8204c3 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/lbzip2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.52 2013/06/02 08:37:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.53 2013/09/23 11:18:45 jlec Exp $
+
+*lbzip2-2.3 (23 Sep 2013)
+
+  23 Sep 2013; Justin Lecher <jlec@gentoo.org> +lbzip2-2.3.ebuild,
+  -files/0.23-Makefile.patch, +files/lbzip2-2.3-s_isreg.patch,
+  -files/0.23-s_isreg.patch, -files/0.23-test.sh.patch,
+  -files/2.1-crc-missmatch.patch:
+  Version Bump; clean old patches
 
   02 Jun 2013; Agostino Sarubbo <ago@gentoo.org> lbzip2-2.2-r1.ebuild:
   Stable for sh, wrt bug #457218
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 40b450befe49..f3673e87fa18 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,31 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 0.23-Makefile.patch 1389 SHA256 1fa306143aa8030381d561c29022bab2775877b7e5dcd3aa63476205ae3c375a SHA512 2cd8d561fc2a5351f8fba57cd6e99a866692b14db9bac4195bcbee4f0dde1f442c8c2ad5f813f690ef62f72c069219ff2755fd8d61a22ea17ab45044d52ac262 WHIRLPOOL 909779dbebb24b162a4cd8e7daa40e3c14d41f302a5e18ec20e65c74923c8cb71edfaab5dce31b831f55ed07114944b5b2f10a3404d1cf4fd8919b9d664a748d
-AUX 0.23-s_isreg.patch 350 SHA256 38c1c133faf8c30440164fad7c1539df555cee606934a3e75ed6a149eeb5d1d6 SHA512 ff0bf55710ec4a9a464515dfd49daee8ab3b4f0ffe4461ada19b8ba8056c10bfc05ee736204906c026ed075345d9f0f5f2d179b09edec189b2b37f99489f7b32 WHIRLPOOL d119c6f291ca149f9114a59eb4ba717cf41856973cf83746374df0aac9cc120a6ee6545f3b4b1a9a3a5e0b4f14316be18df268fef5353212c1b01be2de58abce
-AUX 0.23-test.sh.patch 648 SHA256 e37454a09697a49574068ad5c89d2047a9f4f5d9df32aacd3b01584f2b0477a1 SHA512 2fe226cb030d444d9a0866487596ed039b4e66af39762f1bc93625c1e93a7336697fa01311c3f0d0eee4a528ae513d18f197534d85539f3185dd8e58e1819dc7 WHIRLPOOL d06585234803278d593499af1e439b89f5dbe721d299018eb78f2b947db98bc882580b958b59a1abf1ef59b08abf9ec521b57fd32b99640d74e6d9c0787aa591
-AUX 2.1-crc-missmatch.patch 552 SHA256 3263d1b9452ac65a01a6127e1078ba6cc3ba040c8001e764af2f06d323d13c89 SHA512 b5113b0fe23adc17811b6e7812ca6e671d978c6765519729998077d6aed000f1fd22241b06ab4330534a6813b5b9f5d7aec62ed007957a34d39a39d5041f5b77 WHIRLPOOL d71c7954c2b24528359f05fd7917de75b0aa0cf872b8a38384e95a588d3ab19e7c3bac8492a9a37bdb5ae497d6a3cd7621b0dd698bd94102b363c5a25f81b669
 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.2.ebuild 860 SHA256 eb15019cae723c280bc30742ae1d2cf177861971301245d720bab14c70890a3e SHA512 0ba223c40b6f82d09b77a4813dc749e6a997a91ba8e9f662966704389ae7b69d4cf61b9d8c5dfcd7500560c84387b1839087c158016abf1c00d81302cd156a79 WHIRLPOOL 5fe79226012e8d32ba84aa75709bd688c0dffc8547cf643a8418aa217c323b609ed6609fbc80d9cc8791818ad735bd2443bcc7ad5e32f6ab33773b66fa6a35c3
-MISC ChangeLog 7118 SHA256 c36923995d9a3b3e04ac807939432e6b0c44b1bfbfec970ca970add4081e61ef SHA512 da51a1276e91e99569b8ad9632c93a60335e61d212f7ed73a12af27730dd15bbe5c2a60f7171d49e9da70f91bdbee74e061e06fc929a44b4acd4347a61389ecf WHIRLPOOL 743745c8e589777a52f893980529d9cd377339782b0d5effee112e3840b52e612e4143b16eb83c793794c3888e01a8b7c11cb66c3014d2db20449285db2c0c07
+EBUILD lbzip2-2.3.ebuild 872 SHA256 81ac5f6e70e2ef2a7c0aec76f8fb0083de919abd0984d3cd9dc48f0b2c56dfc8 SHA512 d5082b6dbded063ff8cdfa289ac698b3aabf72fda1bc049d0305bb9695a29b7d83ca5fb73713e547c946a5a93130e69f4f7d40280729dc69c09482a2626270ba WHIRLPOOL 25cd2e575f58cc485812d2a5193b83f641b9657500a75872914142ecd7fabc2bbdbd9e32c1cc6eb096713c30171ad2f54c3ba6cbff11d45c20c34c28b6102665
+MISC ChangeLog 7401 SHA256 6551fcca28fb3866124ca102a3ab43efa9aa7363e75491ba7f7ad62d1d016d8d SHA512 981f36acfc025e2363ef7a36dc9afdcc6e167df187f24df7000bf934570929fe09c51f5b88602efece98c3511b9514b83c461bd556523465efb52d784297d7ad WHIRLPOOL da83d3bfbb0c2d050048b08337dd5a68d05bdc0453bcaa97aff859ee769a1ff3102a1d0d4249e103f87e9a3416505171393d87f476009b9de4a3b194ffcaba7c
 MISC metadata.xml 517 SHA256 c2248b7afbad927ad1278839f066700d7feb2d0f92d5e39066225a3f391a7127 SHA512 8f3de06520fa4f8f1ff273897be36c870b128c561dc776ef27f34fb4eb15172f0d77b7e004b5d9861f23250e1b23b08b36bc2286fee48875c3ec3e1e0cf79bb2 WHIRLPOOL e5a1c3c4a463146d8d4437ba5b34481ffb4b729f4df52247d6682ed5c02475487be782dbaba4677cc4eac51a734e525f85e0ee1d8b4488a9bc58110b441344f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRqwOdAAoJELp701BxlEWfcY0P/0N9DvMaTzqBAIUDfTPeUhIu
-pqH+DUvtOtNPq+qT1H7ZCZd93Rt8bLqhjdNAJhyMJ/JMCCjQ5dYA+nQhpf1aQ/qr
-xWtP8k3sngcCLNVQXM5pW9oVFEs34nxn4PsnuJ8gEvCsWYWDyKo7y4FmwwpJHHPs
-I7UG3DWMTrLc+O6TaSRsNEd5k/SW/4DterpMO6yt+fQup3fryIgVeXeRn6PTGMz8
-16sTDpJp7Q4l/i1ioSLuiIDhgfX7wHM7a7S35L2Y0tFAtRnejzW0n3aYi+lAsMkn
-N6wjWx19gTaY85Um8GA7KVZ4RMa4OIo/P+U0Unsf3lBk5bJpi4bTxx83jzZWoTA3
-3Uh8s53MH8yogi6z/XYTUY+mlEfQEKGuZq3QhDh2Jf7TfdWUIcK3yfxxooFft0uC
-XcmUnYNtY2QoMreZirXfJ82+nPC572SPHAMeGgsKjXC2mhOeWdDvmvukLqwEpP5A
-+jM5yt+Q5Iarphq0tWYU/DcKZy9Q33AR3fJQ7NfL8oTdhXBgq2c8WO2J2650HZCN
-q+k0Tae5Gt1A1zfPDn9+YF/EJ0x8L7dKWnsksOtZ7gUdgWe+5bnh3xarWp718PqU
-tZu5JknSJc0Rc78i4/vas6FG5YaLAt8489v2p7FQutrr6oyF0aMXAI++WGVM+s9R
-p4XmJ2of6ZtBOgpjvotU
-=sUt5
+iQIcBAEBCgAGBQJSQCOGAAoJELnU8jG9FVirhHwP/jupzei+bd/xVgDktZoZUxdi
+0WkRUG0Nj+XyxT+zD26Gocr+jJdok88nGYEBKqmB6+zmEC2K7sdQ0ZXkf6EPiDLz
+vM4H6aoiPLhoMd93gesNKgjL+fq4Aya2o0AMKKGYHEBpRFyvwXE+v/pGnW8eWceW
+UGBLjA/ejiipyZ2WVWsw2c7yTPgza5Lx0nEKH68XIXuRR5TrgFaHyoL5AUz9S+d0
+yIKsa/i5D6OSue7b66bLGXI5XRQLK3AG/nbZWP4d5iCtmuureMl5hufwA69YHHxI
+k6sM66yHz7+Am7yNsxladR3aA2GhdeeBi300oEB7yw83mPSsSutkSAtGzuPG6rli
+ctOxxLulCa0/Hk45CTlRvs3DvnuD1tA/zxtbe4wUWjmtWIuQehQ98txPoUK6Uh4z
+NAbfO0OSymXOtpHOMQ4wPDR4EmaZYJ/eKcT5zDIcY4SgK2TSQeV5zfRxVOfdxcTs
+ogB2b76+qtzFT0RtDTNEphWnaIgJ2Mexf4w6+L9bfqh4pN6ALa3A8Z8SezEO1ZS8
+uOtLvSaPDFJJ9m+PYUzMXEkjzjH3+6Sw8UBRSb7+GdbCi66NSKzqmJqxrIDosm8v
+PKIUzVe12nVFBSqqTULu8OqiL7kp66Ycgdf0I96PIAD5i4DDJwWKkQNF2EfcKZCC
+PuZGCKCH5PVDataP5QF9
+=HlVm
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/files/0.23-Makefile.patch b/app-arch/lbzip2/files/0.23-Makefile.patch
deleted file mode 100644
index 9b8b439399cf..000000000000
--- a/app-arch/lbzip2/files/0.23-Makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile	2009-04-04 00:33:49.000000000 +0200
-+++ Makefile.new	2009-04-15 21:12:02.886390550 +0200
-@@ -1,34 +1,26 @@
- # Makefile,v 1.9 2009-04-03 22:33:49 lacos Exp
- .POSIX:
- 
--CC=gcc
--CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \
--    -O2
--
--
--
--
--LDFLAGS=-s $$($(SHELL) lfs.sh LDFLAGS)
--LIBS=-l pthread -l bz2 $$($(SHELL) lfs.sh LIBS)
-+LIBS=-lpthread -lbz2
- 
- lbzip2: main.o lbzip2.o lbunzip2.o lbunzip2_single.o lacos_rbtree.o
--	$(CC) -o lbzip2 $(LDFLAGS) main.o lbzip2.o lbunzip2.o \
-+	$(CC) $(CPPFLAGS) $(LDFLAGS) -o lbzip2 main.o lbzip2.o lbunzip2.o \
-   lbunzip2_single.o lacos_rbtree.o $(LIBS)
- 
- main.o: main.c main.h lbunzip2_single.h lbunzip2.h lbzip2.h
--	$(CC) $(CFLAGS) -c main.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c main.c
- 
- lbzip2.o: lbzip2.c main.h lbzip2.h lacos_rbtree.h
--	$(CC) $(CFLAGS) -c lbzip2.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbzip2.c
- 
- lbunzip2.o: lbunzip2.c main.h lbunzip2.h lacos_rbtree.h
--	$(CC) $(CFLAGS) -c lbunzip2.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2.c
- 
- lbunzip2_single.o: lbunzip2_single.c main.h lbunzip2_single.h
--	$(CC) $(CFLAGS) -c lbunzip2_single.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2_single.c
- 
- lacos_rbtree.o: lacos_rbtree.c lacos_rbtree.h
--	$(CC) $(CFLAGS) -c lacos_rbtree.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c lacos_rbtree.c
- 
- clean:
- 	rm -f lbzip2 main.o lbzip2.o lbunzip2.o lbunzip2_single.o \
diff --git a/app-arch/lbzip2/files/0.23-s_isreg.patch b/app-arch/lbzip2/files/0.23-s_isreg.patch
deleted file mode 100644
index aab683244d73..000000000000
--- a/app-arch/lbzip2/files/0.23-s_isreg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.orig	2010-03-03 02:12:45.000000000 +0100
-+++ main.c	2010-03-15 10:20:19.562892780 +0100
-@@ -1252,7 +1252,7 @@
-       return -1;
-     }
- 
--    if (!S_ISREG(sbuf->st_mode)) {
-+    if (!decompress && !S_ISREG(sbuf->st_mode)) {
-       log_warning("%s: skipping \"%s\": not a regular file\n", pname,
-           operand->val);
-       return -1;
diff --git a/app-arch/lbzip2/files/0.23-test.sh.patch b/app-arch/lbzip2/files/0.23-test.sh.patch
deleted file mode 100644
index f6ed68a4e1ad..000000000000
--- a/app-arch/lbzip2/files/0.23-test.sh.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Only in lbzip2: .lfs.sh.swp
-diff -u lbzip2.orig//test.sh lbzip2/test.sh
---- lbzip2.orig//test.sh	2009-11-26 22:38:44.000000000 -0500
-+++ lbzip2/test.sh	2011-08-14 19:28:31.746454047 -0400
-@@ -99,12 +99,8 @@
- }
- EOT
- 
--  T_CFLAGS="$(set CFLAGS; set +e; . "$OLDPWD"/lfs.sh)"
--  T_LDFLAGS="$(set LDFLAGS; set +e; . "$OLDPWD"/lfs.sh)"
--  T_LIBS="$(set LIBS; set +e; . "$OLDPWD"/lfs.sh)"
--
--  $C_CC1 $T_CFLAGS -D _XOPEN_SOURCE=500 $C_CC2 -o scratch/nullfmt -s \
--      $T_LDFLAGS scratch/nullfmt.c $T_LIBS
-+  $C_CC1 $CFLAGS $C_CC2 -o scratch/nullfmt -s \
-+      $LDFLAGS scratch/nullfmt.c $LIBS
-   C_NULLFMT="$(scratch/nullfmt)"
- fi
- readonly C_NULLFMT
diff --git a/app-arch/lbzip2/files/2.1-crc-missmatch.patch b/app-arch/lbzip2/files/2.1-crc-missmatch.patch
deleted file mode 100644
index 489eeff754d0..000000000000
--- a/app-arch/lbzip2/files/2.1-crc-missmatch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/lbunzip2.c b/src/lbunzip2.c
-index 113be47..5d8a456 100644
---- a/src/lbunzip2.c
-+++ b/src/lbunzip2.c
-@@ -604,7 +604,7 @@ work_decompr(struct w2w_blk *w2w_blk, struct w2m_q *w2m_q,
-     w2m_blk->id.decompr_blk_id = decompr_blk_id++;
-     w2m_blk->id.last_decompr = (YB_OK == ybret);
-     w2m_blk->produced = sizeof w2m_blk->decompr - oleft;
--    w2m_blk->bs100k = w2w_blk->bs100k;
-+    w2m_blk->bs100k = (YB_OK == ybret) ? w2w_blk->bs100k : 0u;
-     w2m_blk->crc = w2w_blk->crc;
-     w2m_blk->crc1 = crc;
-     w2m_blk->bs100k1 = bs100k;
diff --git a/app-arch/lbzip2/files/lbzip2-2.3-s_isreg.patch b/app-arch/lbzip2/files/lbzip2-2.3-s_isreg.patch
new file mode 100644
index 000000000000..6f4954102f5d
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.3-s_isreg.patch
@@ -0,0 +1,16 @@
+ 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 (OM_REGF == outmode && !S_ISREG(sbuf->st_mode)) {
++    if (!decompress && OM_REGF == outmode && !S_ISREG(sbuf->st_mode)) {
+       warn("skipping \"%s\": not a regular file", operand->val);
+       return -1;
+     }
diff --git a/app-arch/lbzip2/lbzip2-2.3.ebuild b/app-arch/lbzip2/lbzip2-2.3.ebuild
new file mode 100644
index 000000000000..c45db5b54ec9
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.3.ebuild
@@ -0,0 +1,35 @@
+# 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
+}