Use standard `unpack` to unpack the combined tarball.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 34 insertions, 20 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 137e03f1e8e1..21db03d45a7c 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.223 2013/03/15 08:15:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.224 2013/05/08 19:17:34 vapier Exp $
+
+  08 May 2013; Mike Frysinger <vapier@gentoo.org>
+  sane-backends-1.0.23-r1.ebuild:
+  Use standard `unpack` to unpack the combined tarball.
 
 *sane-backends-1.0.23-r1 (15 Mar 2013)
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 9f6778dc54b6..11986956d50e 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -27,8 +27,8 @@ DIST sane-backends-1.0.17.tar.gz 3588993 SHA256 f5478acc07494498fe94aa8801193f85
 DIST sane-backends-1.0.18.tar.gz 3789493 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
 DIST sane-backends-1.0.19.tar.gz 4293184 SHA256 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
 DIST sane-backends-1.0.20.tar.gz 4760873 SHA256 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
-DIST sane-backends-1.0.21-i18n.patch 2250 SHA256 9f0d16a32fd8b8cc9ae5e0639b1c51af2137c5106b9b318f0df818d5689f3efc
-DIST sane-backends-1.0.21.tar.gz 5050344 SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
+DIST sane-backends-1.0.21-i18n.patch 2250 SHA256 9f0d16a32fd8b8cc9ae5e0639b1c51af2137c5106b9b318f0df818d5689f3efc SHA512 fa09a418bcc4ced93d3a4d0dd9bf64b11d62ef2fb428a90170a3ef423069db17bd8d6d3e28980daf33569b70a40fc527299bb4b9c8867b097bb6fea348a3de62 WHIRLPOOL addf1bf1acc06032fdce9cb583a735e81789f22284fca0b977c79a1f3864ad942fd37e96d274ee44878474064bc722ce0efb077bd6c131f57354204c70fa6193
+DIST sane-backends-1.0.21.tar.gz 5050344 SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b SHA512 52b5a22b2af67062eb74afc2383eb72c79deb1ff4341c93d9d5777664d5e622c808b3f68b5c6e0b2db47900221b4111ad3e454d34079f0ad1c0492cbd43eead7 WHIRLPOOL 889260364f005435996e470a0a97710a267490bb63212c9898dad3b04dcf537962965872357d8769bc905937b14e8e5a6244ab3ef1c3e221b629ab358208696f
 DIST sane-backends-1.0.22.tar.gz 5150661 SHA256 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54 SHA512 26ed793bbb4110a7b8bc9c3b22dbc125ba1bb5f7ff89545542ec9cae9c641351e7d420d3f53982e2c6d63577a4c90b24a8f4d6b748be65c98284123f778fcba1 WHIRLPOOL 8b47c0b2b4764155d54ad61c3c6946cc2e5c0a47dd8fe650cb036a51139694d486376c8ad76759b27987f00b9594cf62e849e470873d38a767907eac5a4e0f93
 DIST sane-backends-1.0.23.tar.gz.1 1792000 SHA256 551d7e0c89d18ca438bfce4f1c242b59485195c493c5f935a3b11e724ee39537 SHA512 afc64b9a8232e6d0aaf22e05450ecf814f64c0065bd683f135053d46ef80c42f208eba8642fc8e8f1ded46cb1aa50010987422fd275ea95555f329c76118fa1e WHIRLPOOL 104f820972a23be93c241fb55e4129ab5c2d889cc011f3aa69ddd23e9b4da3ae7b59d8741e9763e3bdcc18f8f1dfe273aaa59ca3dc56dc7f9b78ae6d2b5a3518
 DIST sane-backends-1.0.23.tar.gz.2 1792000 SHA256 b487df0d8dc921803577ee34ceaa676a4a3b6715cd4d9a229b43d6a501a1baab SHA512 ba8723060c3eede0ae68d12d29de180bce012999fcb57774c68f9c9cbf220f069a6b2c4f1d930bd4ad248e4431cfd6e78d20b1f3cbb54e5006fb3b4c4196f9b8 WHIRLPOOL ea67e56ce76dff5a29354f758cb5c9d4b4bae28ffd7197ee066262779412a3a36d733fdcb17ce5ae61d123f395b28640124f7a7a7d28baaae1cb9f24e9299ae6
@@ -40,14 +40,24 @@ EBUILD sane-backends-1.0.20-r3.ebuild 4466 SHA256 48d0e27bccd35635a4034de26e2b93
 EBUILD sane-backends-1.0.21-r1.ebuild 4752 SHA256 48bee91c0181f7308469cc8f56eb3e5c3786a98a422d934a234ba7005dfdd04d SHA512 27da0e9a6d6dde71ecfadb6a6bb4153fba11489fdde6b3a4d57205bc4f3dc49061576130de34af37d6b548640d5547867b9d1ea802f768b872a7e20b29cfa82b WHIRLPOOL bba2cb0a8111f01dff8e531e5bb89fda18eaf8356dbcf9a3967416a604179c97263804883a90d619a69eb9ec3872d3b3b66b10cb0fe07065d82f640027ea83cc
 EBUILD sane-backends-1.0.22-r1.ebuild 4730 SHA256 67369951729c779d1d65402089ae0bae0b8cdf249a1119ae0bd792d464db0f49 SHA512 4fae96e65466a19567bb53d564b0736c9d2ec25a4983f48d63c05901bc9b9e17defe1c1574a4a650b306a6fea54ccd95d740080fd9078f19a5973daf40660c64 WHIRLPOOL dafa3767c0d6c028733b85a46550009767cae3eb866570e1cf9f49207fc8c6984944987888436fa01da21de4538ca3e9ecec12d058b580bcbff366a6b9899490
 EBUILD sane-backends-1.0.22-r2.ebuild 5335 SHA256 d508b8c68a6e1d25eaafade77114383bbeb1fafe4b345c883aea2cfc8c490a85 SHA512 d1844097a8dbf361d58fb7b21a79500f8ce1c5dcd3d8e05abeb72615607ac1f7b04dd3980e22bea8a197ae3953654b93246799b4df9f48a9bdc821cc2001cdf9 WHIRLPOOL f90904045149808de7698e0f9ee2dadaa3bc70f466ff7a54787d2dea18df9c1eb8d9cfabc68c513dda337ab0c1bda1c1658e55d535bda45f338cbda1a5aa80fb
-EBUILD sane-backends-1.0.23-r1.ebuild 6075 SHA256 f31d4ee5b0f81176a6aa2b453ed6371cabe1901d6ca3cd1ab2faaae7d7ca060f SHA512 009242fdc66543737b78bd9a77401fa348d0e9a927e3155f5bb5ad5abcec8ccb2277982f73eead29645c390a7f88404a3c4601c6b19beb3a03939db951cd6942 WHIRLPOOL 62233f5b847a02f345fb0f97575118ff61eda23c918faca49690e832eaf2c1fb080b1f5972d38ddbf0fad3a69edbb48011fe9dacf4a6dea7752505edfc573b82
+EBUILD sane-backends-1.0.23-r1.ebuild 6064 SHA256 e229f10645bb673fdaa505a5ab8d5bc9feb23595014cb2d25ba1ed3d79f1f2fa SHA512 90142bde5731d8213db64afdb13130c0bdb395acf9903927b025b8da0e14715d97302abc0992d431f02a7ea50b852adf4e4f26463f6a11b82c911d4b56913631 WHIRLPOOL 96db597c8a449186fcce1b9f9051c869676eba422793c845b76399095e8b8cf345ab3d639c7ced4ecf93f70c65e9ad8a908c6fa3b8b38a94ae77301b38cefcfb
 EBUILD sane-backends-1.0.23.ebuild 5788 SHA256 b3e6d0a1a2ac2928126fe94c38390d11820539a5006d90827337bca81ee05fa8 SHA512 6fd33141adde09bacd31becd1f21c30f9d52190b2ee16ac4b05bb1298eb140a0595086493ca2b34207b4100bd805435549e909a53f787cca6638b34a1f297f72 WHIRLPOOL d199ebcc098f07a5a71f3eb19edcbd80bd5a00d77f403791a5bf2173df2d07617d841eff8806ba3ddd0f2fdb0fede9df3a689d8e0b5857da331639c5108451d1
-MISC ChangeLog 38494 SHA256 f3c9a1b7bc25f954609e3817b78d41fa6d69dc23e60ab691938c1971f4733410 SHA512 5b11d6fd47b64603d76bfc8e59e838bd3abfd606ad9b45ee1ea74ee95fe7be0b61d85337e30c77ce9b3bb7a21baa6896c6f461d6e28f69561e26e6c91adc1c8c WHIRLPOOL 705ec8983d38b4c04112f2015d7bd6af3592da9cec16bf08c25cb711171824714d8a7b2a59774cf56a9a9ddb932927ee9801bc122c9d1789553a59bb6701c174
+MISC ChangeLog 38633 SHA256 20346c90ecb4addc913efc66fddd573ed9e6b3156d00ff6c6808d15a86adf874 SHA512 b3e1d238632bdbfe3577c22a9e271cb77db635e7e44b882bde14b33a322a1a88b7966d13b81551346aa516f4afe84b928b90e4a204b5db717a465dbeb164317e WHIRLPOOL cb49157bfeb9a8b0b675c65dfa59b3e9071a051c75ccdd34014ad0e715991976c635d03d8382f38e2a9da92b9ecd273cb2ed491f1e03d864f1ca4f48b2dc6c9a
 MISC metadata.xml 203 SHA256 fa46f560cb484f9b761d3b5c3f3fd3368d4d68c241fa2697225f139fe6e03476 SHA512 a3de685bc6e33c3a1e00e3823aa1786ae467259440fa1037fd02ca6a4bb403d1de1530ad41e3f296c1dc765c037408877fb0f7179c349a2e69ee6e8317d61d5b WHIRLPOOL 508c80f71e475b7d6eb2666b3f9e4bf050ca034ba7bbdfb8e378affe203a5a97b5a9cff6b84320dfe0710f44471d680a5904e9e7102f6e921d71f30d2693a40a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFDZCoACgkQRUo/28oeX/ARQAEApT5oq2QtjTpVnwo3Vj+P99/5
-lpHeTeSeKQaV1diu4QgA/iu37zSN4L7AalzN0qDy6gQdhg0e9K2oe+uBFFt4CRZN
-=yH6W
+iQIcBAEBCAAGBQJRiqTTAAoJELEHsLL7fEFWZVAP/jCkpRbhrVzKDMD5Hu2az8Pv
+1ByXAm7CBHC6WMrDkdAcvaVaZe8D/dOmjd4HvU7yFciUxhtIFP6gHrFMRW4bNGDT
+bpOpk9WV4/pK3Vbt8AGVgRD5meyFVmhzBL/6HsgcbGT9eEDCyFT8azpa6DmeZC3z
+lJ9K2JVJXtOoDsJs3vpfnvhVPp4kCOKD6B/tHChPIRNbd/XNDjv+wtDwLJO9TbGe
+Pja70rZCttT8pNQ+MKAOKWub7EPfgtTOixy1Ob8aztJUDwa3GhynHHcwGCCs+9mA
+10SW3UQ6L+Yfxmc8BanMQpePaZtLPZvsx+Ddxv8jndtt/+TM0HVp8lzOKj4480MS
+tJ+oXbqeIzrF3LeilzaxmNZAA5B7WCULQVX/U3V/89Doeh82WglxAleYaXlLjkvV
+1VAQ4hZrxSojMR7OZqoqXk5abz3EwcxhbV/vyPARunuU7fGtPBja3gJBg48cuqdf
+jSrcZ42SORijqLEfiX8+aoBjoCvEIB4YAhUs8R+L4xkZPiV8tmLPR358IxK3S9Cl
+PIY6LOvhbxu5qJHeWtU0V+mJ7bB4gwodGlVF/WQey5xe5aorOCcYFflxmMaBXWbV
+qtCPNQL7w5m8gFaKOPMlKFLxYLPgB5MyCNYtdZFCCnVvjFjQX+Mtu8v1Lo5H8Ru9
+bLqUOPfeWR1lPkZ4tQVQ
+=kpoX
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
index a99aa7e8e4d5..e677b038d035 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild,v 1.1 2013/03/15 08:15:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild,v 1.2 2013/05/08 19:17:34 vapier Exp $
 
 EAPI="5"
 
@@ -113,6 +113,13 @@ REQUIRED_USE="
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
 HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1
+	https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2
+	https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( virtual/jpeg )
@@ -147,24 +154,17 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	!<sys-fs/udev-114"
 
-SRC_URI="https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1
-	https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2
-	https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
 pkg_setup() {
 	enewgroup scanner
 	enewuser saned -1 -1 -1 scanner
 }
 
 src_unpack() {
-	rm -f "${P}.tar.gz"
+	local file
 	for file in ${A}; do
-		cat "${DISTDIR}/${file}" >> "${P}.tar.gz"
-	done
-	tar xzf "${P}.tar.gz"
+		cat "${DISTDIR}/${file}"
+	done > "${P}.tar.gz"
+	unpack ./"${P}.tar.gz"
 }
 
 src_prepare() {