revbump. added patch to fix breakage with >=bzr-0.9 (bug 196547). drop old

Package-Manager: portage-2.1.3.16

7 files changed, 41 insertions, 56 deletions

diff --git a/dev-util/tailor/ChangeLog b/dev-util/tailor/ChangeLog
index 088e93336e64..c537acfad03d 100644
--- a/dev-util/tailor/ChangeLog
+++ b/dev-util/tailor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/tailor
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tailor/ChangeLog,v 1.6 2007/09/17 22:42:42 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tailor/ChangeLog,v 1.7 2007/10/28 21:04:23 hawking Exp $
+
+*tailor-0.9.29-r1 (28 Oct 2007)
+
+  28 Oct 2007; Ali Polatel <hawking@gentoo.org>
+  +files/tailor-0.9.29-compare_trees.patch, -tailor-0.9.28.ebuild,
+  -tailor-0.9.29.ebuild, +tailor-0.9.29-r1.ebuild:
+  revbump. added patch to fix breakage with >=bzr-0.9 (bug 196547). drop old
 
 *tailor-0.9.29 (17 Sep 2007)
 
diff --git a/dev-util/tailor/Manifest b/dev-util/tailor/Manifest
index 3f323bd6ba31..1f7722481bda 100644
--- a/dev-util/tailor/Manifest
+++ b/dev-util/tailor/Manifest
@@ -1,34 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST tailor-0.9.28.tar.gz 173185 RMD160 ed2edd0afee7df1ba22c55a1fd6227af0dbe478c SHA1 f82ebe8616e41b5e27c13d63851d5f0d26d377f0 SHA256 4f9cc31c97b14ee445dce5dd0be9794f5d30af75de710d82a2c55a0636cda50e
+AUX tailor-0.9.29-compare_trees.patch 373 RMD160 5c0b7fb5280b04d3df704645ece9d45b35692f7e SHA1 0173225c5d0b2afb521e30a3aeb0e84e580c1e70 SHA256 4f0a4eeea5d3e32f9a83270f5a60370d8c93f838839850bd094e1474a74b375a
+MD5 2cb1c318ed3c4cf9ac3975986180d6e7 files/tailor-0.9.29-compare_trees.patch 373
+RMD160 5c0b7fb5280b04d3df704645ece9d45b35692f7e files/tailor-0.9.29-compare_trees.patch 373
+SHA256 4f0a4eeea5d3e32f9a83270f5a60370d8c93f838839850bd094e1474a74b375a files/tailor-0.9.29-compare_trees.patch 373
 DIST tailor-0.9.29.tar.gz 208967 RMD160 614b80154bfe32a0fd119409e2e707d4ac3eda83 SHA1 94291010439a5418f01baa97b4f328012f8fb645 SHA256 ee5f2ba0cc8332b83f3b107b1ac239baec2b9a2e889e7a4e8130c6e9c3854d7c
-EBUILD tailor-0.9.28.ebuild 545 RMD160 0056f7175c3c598ef404774c544eca6b00253ea0 SHA1 3162c06541d0bb8c9fdea4aed35c6579066ad3a1 SHA256 dac90e0dca783855a32ff5509f280700c6c5556046a9d4754bac679e230a1311
-MD5 1ddab998e3dbf02bbf27023602e03f99 tailor-0.9.28.ebuild 545
-RMD160 0056f7175c3c598ef404774c544eca6b00253ea0 tailor-0.9.28.ebuild 545
-SHA256 dac90e0dca783855a32ff5509f280700c6c5556046a9d4754bac679e230a1311 tailor-0.9.28.ebuild 545
-EBUILD tailor-0.9.29.ebuild 542 RMD160 e75a0c20a41b804cacd94acae68252fd68332e98 SHA1 0c517c853de9171c14b6a5554e0a14828bdd26db SHA256 ab6636ba9e7894603ac62554142a1319bced26e7e6bb81ae7fe1e83eb75d8c5b
-MD5 c0a89ff8dded9c7cb0c42f98b37d8984 tailor-0.9.29.ebuild 542
-RMD160 e75a0c20a41b804cacd94acae68252fd68332e98 tailor-0.9.29.ebuild 542
-SHA256 ab6636ba9e7894603ac62554142a1319bced26e7e6bb81ae7fe1e83eb75d8c5b tailor-0.9.29.ebuild 542
-MISC ChangeLog 1222 RMD160 11ec4065ace830b2e64aaf091d8702b492ca73a0 SHA1 f4116970dbe5daff7e619346f028fec167d8852a SHA256 90bab50313a1fd9bf1e300c92dd7cf3a32f6b0b123ffef064180fd9ffacb0b2d
-MD5 f65bcdfbebd487f363baa09a4a6ac2dd ChangeLog 1222
-RMD160 11ec4065ace830b2e64aaf091d8702b492ca73a0 ChangeLog 1222
-SHA256 90bab50313a1fd9bf1e300c92dd7cf3a32f6b0b123ffef064180fd9ffacb0b2d ChangeLog 1222
+EBUILD tailor-0.9.29-r1.ebuild 642 RMD160 811b0a00ce70318e99a61670c7bac391d0b108c7 SHA1 1af443cd978a69984565d1e13aa2ea51c1677a0a SHA256 8f0b9376388cf8b88a683a2912f757cbec932ff6632a9c6dc5dd127cf4705fa9
+MD5 42fc556e47f809151c68d198598def58 tailor-0.9.29-r1.ebuild 642
+RMD160 811b0a00ce70318e99a61670c7bac391d0b108c7 tailor-0.9.29-r1.ebuild 642
+SHA256 8f0b9376388cf8b88a683a2912f757cbec932ff6632a9c6dc5dd127cf4705fa9 tailor-0.9.29-r1.ebuild 642
+MISC ChangeLog 1501 RMD160 2bfe39981305c689d8c23d89c102c4ee2da770e4 SHA1 8bfb8b044c29f7be8c18997d7073ccb9a43ebf00 SHA256 20dc9950709d29de1913b281f0f14a16f7e24f7422f2022eeff2c40d45fe63c9
+MD5 6f4a55a0023a279554761d9244039e13 ChangeLog 1501
+RMD160 2bfe39981305c689d8c23d89c102c4ee2da770e4 ChangeLog 1501
+SHA256 20dc9950709d29de1913b281f0f14a16f7e24f7422f2022eeff2c40d45fe63c9 ChangeLog 1501
 MISC metadata.xml 481 RMD160 ce9a1198a38410348c5536a688ce0ae3d6f33fa3 SHA1 f700fddc2e8de18a7427073d6f979d67c7418fab SHA256 3e573a6af44722ff0fe7b60b025e06306aaec0c1df170ded97916ed03e39321a
 MD5 450012983b54084a86cb510b34407e0f metadata.xml 481
 RMD160 ce9a1198a38410348c5536a688ce0ae3d6f33fa3 metadata.xml 481
 SHA256 3e573a6af44722ff0fe7b60b025e06306aaec0c1df170ded97916ed03e39321a metadata.xml 481
-MD5 77868e647e9bcc1eeeec11f52d63aa17 files/digest-tailor-0.9.28 241
-RMD160 808406b337ec7a92d895618fc5ae4933a7b49fe6 files/digest-tailor-0.9.28 241
-SHA256 11d52e9a28085bcccc285ef4060769f885fbeb3aafaca0c8ab106dc437910dad files/digest-tailor-0.9.28 241
-MD5 7edc8fd5bd998bfbe6903f65c76fa2b8 files/digest-tailor-0.9.29 241
-RMD160 9aff043f712cb60a570f43227eceaf119a3ef97e files/digest-tailor-0.9.29 241
-SHA256 b258e08c2c9fd86a5176a9bd6324f685c1d230464a19abbe20d7c0c93ea7ce69 files/digest-tailor-0.9.29 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG7wLrz974XjDVpbkRAmRpAJwJCENyVPrcjSG5Ayv6fVdTlua9XgCdHDE8
-bFYbUxEvsgw+pnbdsi4/7JU=
-=HWRL
------END PGP SIGNATURE-----
+MD5 7edc8fd5bd998bfbe6903f65c76fa2b8 files/digest-tailor-0.9.29-r1 241
+RMD160 9aff043f712cb60a570f43227eceaf119a3ef97e files/digest-tailor-0.9.29-r1 241
+SHA256 b258e08c2c9fd86a5176a9bd6324f685c1d230464a19abbe20d7c0c93ea7ce69 files/digest-tailor-0.9.29-r1 241
diff --git a/dev-util/tailor/files/digest-tailor-0.9.28 b/dev-util/tailor/files/digest-tailor-0.9.28
deleted file mode 100644
index fe526e6c65dc..000000000000
--- a/dev-util/tailor/files/digest-tailor-0.9.28
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82033c16e895d51ae5893def06c59d29 tailor-0.9.28.tar.gz 173185
-RMD160 ed2edd0afee7df1ba22c55a1fd6227af0dbe478c tailor-0.9.28.tar.gz 173185
-SHA256 4f9cc31c97b14ee445dce5dd0be9794f5d30af75de710d82a2c55a0636cda50e tailor-0.9.28.tar.gz 173185
diff --git a/dev-util/tailor/files/digest-tailor-0.9.29 b/dev-util/tailor/files/digest-tailor-0.9.29-r1
index b6587e194333..b6587e194333 100644
--- a/dev-util/tailor/files/digest-tailor-0.9.29
+++ b/dev-util/tailor/files/digest-tailor-0.9.29-r1
diff --git a/dev-util/tailor/files/tailor-0.9.29-compare_trees.patch b/dev-util/tailor/files/tailor-0.9.29-compare_trees.patch
new file mode 100644
index 000000000000..00d56f8d9b81
--- /dev/null
+++ b/dev-util/tailor/files/tailor-0.9.29-compare_trees.patch
@@ -0,0 +1,10 @@
+--- vcpx/repository/bzr.py	2007-07-10 19:49:12.000000000 +0300
++++ vcpx/repository/bzr.py	2007-10-28 22:40:06.000000000 +0200
+@@ -22,7 +22,6 @@
+ from bzrlib import errors
+ from bzrlib.add import smart_add_tree
+ from bzrlib.bzrdir import BzrDir
+-from bzrlib.delta import compare_trees
+ from bzrlib.osutils import normpath, pathjoin
+ from bzrlib.plugin import load_plugins
+ 
diff --git a/dev-util/tailor/tailor-0.9.28.ebuild b/dev-util/tailor/tailor-0.9.28.ebuild
deleted file mode 100644
index a44f5f1718d2..000000000000
--- a/dev-util/tailor/tailor-0.9.28.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tailor/tailor-0.9.28.ebuild,v 1.1 2007/06/18 15:30:01 dev-zero Exp $
-
-NEED_PYTHON=2.4
-
-inherit distutils
-
-DESCRIPTION="A tool to migrate changesets between version control systems."
-HOMEPAGE="http://wiki.darcs.net/index.html/Tailor"
-SRC_URI="http://darcs.arstecnica.it/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_MODNAME="vcpx"
diff --git a/dev-util/tailor/tailor-0.9.29.ebuild b/dev-util/tailor/tailor-0.9.29-r1.ebuild
index 1a93d08eff15..25b47c0d8297 100644
--- a/dev-util/tailor/tailor-0.9.29.ebuild
+++ b/dev-util/tailor/tailor-0.9.29-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tailor/tailor-0.9.29.ebuild,v 1.1 2007/09/17 22:42:42 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tailor/tailor-0.9.29-r1.ebuild,v 1.1 2007/10/28 21:04:23 hawking Exp $
 
 NEED_PYTHON=2.4
 
-inherit distutils
+inherit eutils distutils
 
 DESCRIPTION="A tool to migrate changesets between version control systems."
 HOMEPAGE="http://wiki.darcs.net/index.html/Tailor"
@@ -19,3 +19,9 @@ DEPEND=""
 RDEPEND=""
 
 PYTHON_MODNAME="vcpx"
+
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}/${P}-compare_trees.patch"
+}