2017-02-17 15:02:42 UTC

5 files changed, 39 insertions, 36 deletions

diff --git a/metadata/md5-cache/dev-vcs/mercurial-server-1.2 b/metadata/md5-cache/dev-vcs/mercurial-server-1.2
deleted file mode 100644
index 886b5f9ba4bc..000000000000
--- a/metadata/md5-cache/dev-vcs/mercurial-server-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) =dev-lang/python-2*
-DESCRIPTION=Mercurial authentication and authorization tools
-EAPI=3
-HOMEPAGE=http://www.lshift.net/mercurial-server.html
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://dev.lshift.net/paul/mercurial-server/mercurial-server_1.2.tar.gz
-_eclass_exported_funcs=pkg_postrm:distutils pkg_postinst:distutils pkg_setup:- src_prepare:- src_compile:- src_install:-
-_eclasses_=distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=090f25d363903505ee3d3910858e4d21
diff --git a/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1 b/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
new file mode 100644
index 000000000000..98bb5e481012
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=Mercurial authentication and authorization tools
+EAPI=6
+HOMEPAGE=http://www.lshift.net/mercurial-server.html
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-vcs/mercurial >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://dev.lshift.net/paul/mercurial-server/mercurial-server_1.2.tar.gz
+_eclass_exported_funcs=pkg_setup:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=24dcd5162ea94ee42a610f7fe3f0b021
diff --git a/metadata/md5-cache/dev-vcs/mercurial-server-9999 b/metadata/md5-cache/dev-vcs/mercurial-server-9999
index 70f4fd26cbfa..905fc49fd581 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-server-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-server-9999
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) =dev-lang/python-2* dev-vcs/mercurial
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-vcs/mercurial
 DESCRIPTION=Mercurial authentication and authorization tools
-EAPI=3
+EAPI=6
 HOMEPAGE=http://www.lshift.net/mercurial-server.html
-IUSE=doc
+IUSE=doc python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial =dev-lang/python-2*
+RDEPEND=dev-vcs/mercurial >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclass_exported_funcs=pkg_postrm:distutils pkg_postinst:distutils pkg_setup:- src_unpack:mercurial src_prepare:- src_compile:- src_install:-
-_eclasses_=distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	ea170b525f6a38a006be05c9d9429f13	mercurial	66da6d1ccacd123e28d2c64821052a9a	multilib	165fc17c38d1b11dac2008280dab6e80	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=579aa046a700eb985093be497f5bf22f
+_eclass_exported_funcs=pkg_setup:- src_unpack:mercurial src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	mercurial	66da6d1ccacd123e28d2c64821052a9a	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a9c2d11a61c807fa7f0b9d74e14d0206
diff --git a/metadata/md5-cache/dev-vcs/rabbitvcs-0.16 b/metadata/md5-cache/dev-vcs/rabbitvcs-0.16
deleted file mode 100644
index 0babf5f654a8..000000000000
--- a/metadata/md5-cache/dev-vcs/rabbitvcs-0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4 =dev-lang/python-2.7*
-DESCRIPTION=Integrated version control support for your desktop
-EAPI=5
-HOMEPAGE=http://rabbitvcs.org
-IUSE=caja cli diff gedit git nautilus spell thunar
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/configobj dev-python/pygobject:2 dev-python/pygtk dev-python/pysvn dev-python/simplejson caja? ( dev-python/python-caja dev-python/dbus-python dev-python/gnome-vfs-python ) diff? ( dev-util/meld ) gedit? ( app-editors/gedit ) git? ( dev-python/dulwich ) nautilus? ( >=dev-python/nautilus-python-0.7.0 dev-python/dbus-python dev-python/gnome-vfs-python ) spell? ( dev-python/gtkspell-python ) thunar? ( dev-python/thunarx-python dev-python/dbus-python ) =dev-lang/python-2.7*
-SLOT=0
-SRC_URI=https://github.com/rabbitvcs/rabbitvcs/tarball/v0.16 -> rabbitvcs-0.16.tar.gz
-_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:python src_unpack:vcs-snapshot src_prepare:- src_compile:distutils src_install:-
-_eclasses_=distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	ea170b525f6a38a006be05c9d9429f13	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b8e37a6cd61a13f3ae53db433af8614a
diff --git a/metadata/md5-cache/dev-vcs/rabbitvcs-0.16-r1 b/metadata/md5-cache/dev-vcs/rabbitvcs-0.16-r1
new file mode 100644
index 000000000000..eb9a5d960db8
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/rabbitvcs-0.16-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=sys-apps/sed-4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Integrated version control support for your desktop
+EAPI=6
+HOMEPAGE=http://rabbitvcs.org
+IUSE=caja cli diff gedit git nautilus spell thunar python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pysvn[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] caja? ( dev-python/python-caja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) diff? ( dev-util/meld ) gedit? ( app-editors/gedit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) git? ( dev-python/dulwich[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nautilus? ( >=dev-python/nautilus-python-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) spell? ( dev-python/gtkspell-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) thunar? ( dev-python/thunarx-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/rabbitvcs/rabbitvcs/tarball/v0.16 -> rabbitvcs-0.16.tar.gz
+_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_unpack:vcs-snapshot src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=151db850f225fe36d70800ed141b1bb1