sys-block/blocks: fix dependency, #494570; use versioned tarball

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

4 files changed, 34 insertions, 26 deletions

diff --git a/sys-block/blocks/ChangeLog b/sys-block/blocks/ChangeLog
index 44814a9bfa0a..aba013dcb08d 100644
--- a/sys-block/blocks/ChangeLog
+++ b/sys-block/blocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/blocks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/ChangeLog,v 1.1 2013/12/10 08:16:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/ChangeLog,v 1.2 2013/12/18 08:00:31 jlec Exp $
+
+*blocks-0.1.4_pre131210-r1 (18 Dec 2013)
+
+  18 Dec 2013; Justin Lecher <jlec@gentoo.org> -blocks-0.1.4_pre131210.ebuild,
+  +blocks-0.1.4_pre131210-r1.ebuild, blocks-9999.ebuild:
+  fix dependency, #494570; use versioned tarball
 
 *blocks-9999 (10 Dec 2013)
 *blocks-0.1.4_pre131210 (10 Dec 2013)
diff --git a/sys-block/blocks/Manifest b/sys-block/blocks/Manifest
index 54ba7605c7c1..6a9fbfde9b8d 100644
--- a/sys-block/blocks/Manifest
+++ b/sys-block/blocks/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-EBUILD blocks-0.1.4_pre131210.ebuild 1381 SHA256 40f46d788a219cae4caf4434b660223f32a903d6eafca98916481deaa7a24541 SHA512 e5c5acbf4aaa44aba422e7d7186f2f2344cb7b662afb77283359559989c101fcc3ce3768bfcb3c210f80146eb89ef1b029e180b975c282af1273d780b5d42765 WHIRLPOOL a6b79e27db17c9ee8fa69877e40536b0c34743a4645eab2a1bd4762baa32451f52f63a182a5a2ce8ddc264c34db12775c8d18261b845011a7b3ed05eb364af25
-EBUILD blocks-9999.ebuild 1335 SHA256 c4c7bb2a5ee79f0202de5595a61d86e9455399ae22744785195c379abf605797 SHA512 212fb87e2b690f0f88d73318543378066d92d900e6b30ccd6577f3a010f332d0393dd328316eab03eab3a44e5300eb1bd2c9592a9105200ae84a5c720ef812df WHIRLPOOL 1cdd863bdf9a7c056347eee9d19bcc13f276b3f49757c5bb05a9a3b0d7438f3543ec31ccdc94079d378e4ee274561d6f3afe674be13686c4d718488939d0da2c
-MISC ChangeLog 425 SHA256 a2e22b21547386d8280aef99524702dfcd7f3c11976d396aa5717c2efeb6c8e9 SHA512 54d9f58e6087054aa7178c68bdd4818a07154a64306a63c930fe613bebf56997b9270d61440168ed8b21346c8630b9383bdfb6708c0da92aed98b939db457f43 WHIRLPOOL 7e357c980c6ce58de59277a47c58027950fbfb86d850b12fd709d27a275b6c29f0f23bd8355ecd5e14a24f033363f77c12ee1b4f46f6cf2863fb6d9c31c1c521
+DIST blocks-0.1.4_pre131210.tar.xz 33684 SHA256 0e44b6b17ccf3e3c6ad79f5990f167bb6fa6355c6d0020e3bac7a5a926bd309b SHA512 05ad49f2ece5cdb92097f60b5f69cfbb7d409ac5e1ffb98488f26b51ad07ed7dad8eeb3fd302a06b3e199e816e45c2c69daecc13a19627252b8245372f324a58 WHIRLPOOL c48876b36ea51ae8ff8f85785a1fa9aef9264136442e13c198b58c0bbbbb18ef0c866c5fa53335f4d9b35052a77d5189470f1a64d08cfa0552da0a639dbfdbc1
+EBUILD blocks-0.1.4_pre131210-r1.ebuild 1398 SHA256 c1efacd96aa23cced91ffb231e5b4cf9f21caf4d1c26e5bc692ec585422edbe2 SHA512 109c2ca25d7dd6653b2280c279e2c44c5ca251a057a22e5dbb6b003bb04800dfeee9bf4e16ef559b93abc9c99947371f005d309eba77a145a00eb0aa4d884e27 WHIRLPOOL 7edd53b4fabb918d787df83270eab710b9de2c09c9e868fdae2166b0d5f975315517bbf2488f6f4dc5965060508845c762d901a79a36c7b9a99f0feed3ab23aa
+EBUILD blocks-9999.ebuild 1357 SHA256 0689b64093f66e7c3f48aea977c2a2dd9c870078235583610773515055c45dc3 SHA512 feedb02d285fcc23a1a379f90935fb9e245bb1a36c1d2af375d9f48a746aebdadd2e73a80e13da51e32f97d3935500fd7ef5889dff45613b5f899b3f7c5b5976 WHIRLPOOL 589dd08a35645cc135377507daa17ece03eaf3ca790acf0befc24cfa3cc74d5f7422814f1692815e8a88886ddc46063c30b434b48918261f0d7bc23c8dcbb5bf
+MISC ChangeLog 653 SHA256 48d204f66988e52f6440932c98122842e32118e22dcb66a0b16a4957c29e97fe SHA512 b8d05f37c10cd3501fdfb7c49e971c756b821c031f6dfac6d56b430fb9b8337affcfe5c82beda0c5fe0ad42c9fe07100daa4f00c5e46e4c3e4a7c77ddeda3967 WHIRLPOOL 4d57d2d7b8efde1c14b8c51cddcc15d2a9a206b51c83d0e23184480fa02b3d928222417b60ecc3318aa4817504f682b9b89f8a1e2cd6eb9014a93be640f8da57
 MISC metadata.xml 382 SHA256 a37f1863a2a48270558d1575a0d81be153abcac47055f6657aa14f13a2206167 SHA512 aa86fb4e06de5be9149dce27ff18c0ff5ddfc0cc66cec9592dca81fca36048312e75cb3281676484ffd3155f49039b9e231d835fa49a966c934137ddb7c1ea1f WHIRLPOOL 57b77ca9d4dd3b0fbb6f2c848a49e2876fcddc93c92df45c5f050df53fee9152fb1e36e57d154da54c8bcad76e43bcca1ef4956d9a8176a29998cc137cd57ad4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSps3hAAoJELnU8jG9FVir3pkQAIa5o7TXR4yCkl1DkeJC/4Fl
-A7VjpoFnOsFYJKo1mVwXxMhqtgIWR5HRWJycXQuV26KuGcxJ6J8lDWqDjuNolCuk
-vzMRFKJbQ8zkC+GFTHXiR3eyxdznFup21DO/e1yaRSibGcII6UWMNU3o88OWTGNm
-fiS+yRW8XnUvex8DkOVOV2mr0nHb3M92emjQEPXkMZNuKRzSoVEVCoH/TBZSnw6Y
-XYwrQSL0kW6J/2xL8tJOKBHhd46OP6uDcZVGayWOTOfk4411vcNSZv7QxjCzybp3
-YW7FRWoHoftQGP0GPFGkv5PyyUYZzjZ4NB3GY55KJj4AZV1cbFslkShDstgsYxCW
-66WRhiRS3TKcl+zSLjvQGxcQhjfkO6uEsdIc9RZWUNwl6cvzps3wEvpADDLicCi9
-ynZ2ZZL4mC+0KIu+uEChXhuiUbnK/xl8eXhHrfOrygl754qlJDzB8F1pTxVgeFTo
-FZFAROXbRBp3RmUwEuUyih/wqlgIyZMdgtLOwhrXevKOpGQP0Kls/lc17PB928Pw
-JORUBT/6mjBBC3oNkEF7+Y8PapX48Nv583t2Mue7OY/dg8KU6S/myzKamirapM3V
-8OqKTgEhDJegt72eD5Rk1ndAwS/NlaT49K4Hto0RAUiUB7TFXbY40zwqhoNeWXbC
-ctg1C3yeqk8U/RlBCQen
-=O7Lz
+iQIcBAEBCgAGBQJSsVYjAAoJELnU8jG9FVir6LsP/3m+7BnLc3zo2Squ01dm/LoW
+tN/P92ajzk6vGN2enSbHYdn/7jiJZqmzIMWjqPrgDBrPGbX4BFgn7HfoK0jjOqhz
+FIj8w41QuvE2JPw2XU3xWvCt/LuiZTEhOVhmYLVamxtFtq1WVcbRl/LheocIPMjC
+Zjp+6S+Hgs0QPUQ4mk7aTKh7W1iNM2969n588v808o2+QoxmoJCIIp1Zno+nLrrG
+4RIa6xPicVJwStAdY1N0pDd0u4rV6T8a2cUn5GvM1ZDr2/dgunTqvn4jtgzZJ6gH
+awxX0VcH+UTDu6QdvC3jMUNZXKe08RKCLcx935bx8sZGVWj8LfWmSLiAqXWIwB13
+f3NlkOgJ5Z+NxmJLL+MI8VRvQWuEyxVhI3xq0SnlgWeORIj2XqD/OX5mJRYQER9j
+oWWY7u3iEgIErhSGItGoJqxGUP/00d276kYRouE7R2b7F/+7TKOPm8/2LZyUC+8Y
+EKg6MlmOXhU78uwmEXUydOcZDzKQV3FMUDyQ259qPfoEzSoHzJNZFijD+qczMGPl
+kfq8qkJ20AUIb61TVwPzgdEzuXEnOpMuLJMzDBzVD1KJfHjFAg9tzi223c9Vj+Xs
+iHsFxFo9EebmI69NimnHndh95J//FmuSHhDBmbsFvGawusZVDLeF5Qdd/avtuZ+I
+yfMpT11azQlzPsQRQSqz
+=z+7/
 -----END PGP SIGNATURE-----
diff --git a/sys-block/blocks/blocks-0.1.4_pre131210.ebuild b/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
index b36dbfa7eaae..9e6d5f245c7d 100644
--- a/sys-block/blocks/blocks-0.1.4_pre131210.ebuild
+++ b/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/blocks-0.1.4_pre131210.ebuild,v 1.1 2013/12/10 08:16:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild,v 1.1 2013/12/18 08:00:32 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python3_3 )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="Conversion tools for block devices"
 HOMEPAGE="https://github.com/g2p/blocks"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/g2p/blocks.git"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+minimal"
 
-DEPEND="dev-python/pyparted[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/pyparted[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	>=app-admin/augeas-1.0
 	>=sys-block/parted-2.3
 	!minimal? (
 		sys-fs/btrfs-progs
diff --git a/sys-block/blocks/blocks-9999.ebuild b/sys-block/blocks/blocks-9999.ebuild
index dfe8972715f9..1d93734b6391 100644
--- a/sys-block/blocks/blocks-9999.ebuild
+++ b/sys-block/blocks/blocks-9999.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/sys-block/blocks/blocks-9999.ebuild,v 1.1 2013/12/10 08:16:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/blocks/blocks-9999.ebuild,v 1.2 2013/12/18 08:00:32 jlec Exp $
 
 EAPI=5
 
@@ -18,9 +18,10 @@ LICENSE="GPL-3+"
 KEYWORDS=""
 IUSE="+minimal"
 
-DEPEND="dev-python/pyparted[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/pyparted[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	>=app-admin/augeas-1.0
 	>=sys-block/parted-2.3
 	!minimal? (
 		sys-fs/btrfs-progs