Convert to distutils-r1, bug #477724.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

5 files changed, 101 insertions, 97 deletions

diff --git a/www-apps/ownpaste/ChangeLog b/www-apps/ownpaste/ChangeLog
index 131c54fbf1cc..dc092ab35202 100644
--- a/www-apps/ownpaste/ChangeLog
+++ b/www-apps/ownpaste/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/ownpaste
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ChangeLog,v 1.6 2012/12/26 23:30:45 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ChangeLog,v 1.7 2013/07/24 17:48:45 mgorny Exp $
+
+*ownpaste-0.2.2-r1 (24 Jul 2013)
+
+  24 Jul 2013; Michał Górny <mgorny@gentoo.org> +ownpaste-0.2.2-r1.ebuild,
+  -ownpaste-0.2.2.ebuild, ownpaste-9999.ebuild:
+  Convert to distutils-r1, bug #477724.
 
   26 Dec 2012; Christoph Junghans <ottxor@gentoo.org> ownpaste-0.2.2.ebuild,
   ownpaste-9999.ebuild:
diff --git a/www-apps/ownpaste/Manifest b/www-apps/ownpaste/Manifest
index 0a560e776f23..ca24d334a7e1 100644
--- a/www-apps/ownpaste/Manifest
+++ b/www-apps/ownpaste/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ownpaste-0.2.2.tar.gz 22030 SHA256 98e6bb80ff395617ce037968a739f8f71c1d0fd140914317986a9cc68e8878df
-EBUILD ownpaste-0.2.2.ebuild 1308 SHA256 e2d09dd39b4d19ef4ce8b6103fcb2af077577127a83e86bd6291926e3e3f8891 SHA512 0e7e2bc78357148b65399771af66971b03ea05220312ac2a33eb01628c339e057cec48255bec93a459dbd92e95508152a9e521a7c06c4f3c08adfe10def98b5f WHIRLPOOL 10033dc2020ba8335a4c2d38d958abc6d9708e3f45841739763d81aeecc4d71521d08cd6b4ca3625ed84596423742952d69037031595d534308638d7ad225ea4
-EBUILD ownpaste-9999.ebuild 1307 SHA256 f0ab678f28da9d20f46c43cd8d8d831d5da92a5ddc42f25f371969dd0bb099dc SHA512 3bc7d801a2da124a2362ee1964bb955cdb18b55c69d26e593e30dfd664e458e1f9773eaaa5d704730389e3236ff2d2326727a0c7be099d05884a7d0377c9c193 WHIRLPOOL 302ee2259e844a176186ccffe9f86ce480cecba0ead2ab8378935e6164a4c5560da4468ca28d6472e1aa1a78f64de7f95e179ec19192dd32634d03188b26ecf2
-MISC ChangeLog 1153 SHA256 874544b13406cf93f70621726cdad7bec915234fb9be3142280b2907f756fc2c SHA512 d8bfdfd4e737911a7041da1f235f57b09f8fae09d01557b0ae73cf8da30cd2fb143fcecc19aa49070de43cdac55037eb38da1c3e1edbf4c455eab2b1a541883e WHIRLPOOL a67b6bf86e7b5e3a8231dbe2c9523f9442dca82fcea0e2a3c86691b2bc3b1b7f5e2d349396dc0158fe2ba0193cfb6b70d3a15f0c6d4250ab490323108c16ada2
+DIST ownpaste-0.2.2.tar.gz 22030 SHA256 98e6bb80ff395617ce037968a739f8f71c1d0fd140914317986a9cc68e8878df SHA512 2a55e89e00e7530aafab427e7e2e4015391a68a8c7b8843cdd5b1010f492a4ecb6f28f33b2a92812a7072a35f3437f08ac1635867b492903256e92dabcb9beaf WHIRLPOOL 1ee3e1a8ff2756c1062fdb0492d96d9ef17d30919227f67480fd7bc1e73e37ca723acecbdcd243e30f5e554a4c11e8bdaa55f804a29eb402acf9b1cd05848a00
+EBUILD ownpaste-0.2.2-r1.ebuild 1422 SHA256 3b997f634ba8ba3d65e07cf562befaed45f86d8373e94497f8f86df3ead6d30f SHA512 bfda928ddb3173941faa0896f6e7795e4f1c9167117e6d37f9a41b2f9d4a42139920e427c11e27f925670ad0ef50fb27e9db80805dab1eaacd7568c2fce67d75 WHIRLPOOL 7df5f9f84ef8da0b0a0cc068a4de0dab2a82aff13ce3f8d41b39f5f4e594f370c4793fcc1818c98467185eb9f1ff41ec444a3cb6ad274e6871a936c9d08aba31
+EBUILD ownpaste-9999.ebuild 1418 SHA256 1321b28a69ce2377f29ee28eb1f0d6a38bc38a125854bbb0defbba4f84b4ce88 SHA512 45f9d7c51b5640cfe72b0bf9b46acd7b90a1702106f0b411f4f7a8497843ed4db0899a5978ade5980b4f6c27ae0cf235741df9837ccf31261c07250b538be6a5 WHIRLPOOL b53adcb29484bf1067e989100f824445cf50e0c40cb7b3d01ba6ee012e2856278793fa967916212917cd621076ac63382cf1b90e298117e98f944acd45a089df
+MISC ChangeLog 1353 SHA256 38442917c199755ae34958a1f1530626f661347e46739f8b730a132b4f076697 SHA512 9208335a95fecdc7eddf64deed0c961e8720edc32220467fedf30dae153ba9b089f20aad030d80654e7856bceec8515566c09b85b92932789b0f1deaf306ee09 WHIRLPOOL 95b3e3d18c7a5d910d2cffff2e25b44e04367dd39208a69dce6e1d39d62fa5dc69e57a4781f8fda0ca54ab917c684636a8ae97fcc00e7c9ede8bed6a0196ea79
 MISC metadata.xml 438 SHA256 367443f339c9211f633a9fc67e66b303f21a0a5216625072ebb65f59d8f89376 SHA512 30f9969cd63d6fae019d98ba2fb13480684082161ccdf1875f04d3ac8747fe415ec68d3ed1df108b6f1c2d6efdc2187a88b3e223703b913c17bf5d0b022e94b9 WHIRLPOOL 6ff53aed1a23ecffd6fe6071f6f5113e3c9d67080a598e51bf360ba7ec1ee6c67f7aa749287314e8f72f99d4a371f0e6c4be178963cdf26db902d54248adba40
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ24imAAoJEOeBhlrCAAWGNJsH/ib4YHa7Q1ejDOR+dfMwgqW+
-/Qb+xFCPWb3WangazCXm641lUe7xK0PdM9PjXnspYfcIWtcXiIztLTwoUkafAo6P
-/UFCWFX/rc1NyrGkbHj6DKyQYAYy3IcPe/eKQlENZJTwmNkA2tUvmGRanT29vSWa
-0Rw3CTPXlRsU5gksv1uYQTrW3/ZvySVFcRwl4xCFHjyjDrdu+aI17x7UIXVB2tFB
-oXH1hccx7gAUC20jakt/APTCEebWjW5q6P2l7gXjjha4LVC6Xd7n/N/bdLEJbxUB
-Upw/+GOBnWWEb4pfob7gpo6/FDLCVg7uUhWkvT6iUgwoV3+KH7avbJ/X+8MLtu0=
-=nHqT
+iQJ8BAEBCABmBQJR8BOSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDStIQAIJ7YkyP934bJ/6qIU8jBIjf
+J6jUYvSNiFHb2JUX+b2LqU9PGmOFtnr73k41rmxVs9ltbugfAhPDIE24bigNLSgX
+0ql//UGID8ouHRdLdLn0n3tsj8HZ9r9dwqn2FYujckvqRfYj6/KFto18ScDMBBHg
+DL9SxpSrQXhrLjT5pgAv3WN53pkFic/DGDskLHWeO0JdNm09ST/c3foolAw/5yTR
+QJQ6GEFP3dPbK1VIhKhohbtSx90MuPk760kTK2koEa7YMwXn0b8DFd9Y8c+BXT+s
+BdSx+Rbbnu2Mvgl5CfSi8JkSej7hA1yz/U30ZqiygWc9qZTB8ZJE7GqaQ1Y2twYp
+1T1tDI8703JvenV66ZOkc/tHYaJZinMhRT3LE5SgysEDjxargAYRfWUc6Z0r+2JY
+we1ItNd8v6mY/qSXSDZVei7fLS1JeDHvampcK4GkbHS/x2ST0WpM+IeWLtdDJF+E
+VKHbgf7ZC02H9Ios8VZxwFk8l6LvOQ7iifv5a8fuO1CoiJVITQRWDeOp5kaoLR/i
+/B+LCVmG0/tMUzHmMbDJq6CKGSltyzMlP2XaG0in7DWMNd9n1tROhyKySsGEAXaa
+VOWALfsU8LTdteo7GomJGr3GLvbQa3OiihQwDzE/Uqe0efZrhQwUjFrfqCT/NyvH
+8IdJLVRnSoMQuiV1QgXY
+=rzgj
 -----END PGP SIGNATURE-----
diff --git a/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild b/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..7661ff87d444
--- /dev/null
+++ b/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild,v 1.1 2013/07/24 17:48:45 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+HG_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	HG_ECLASS="mercurial"
+	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
+fi
+
+inherit distutils-r1 ${HG_ECLASS}
+
+DESCRIPTION="Private pastebin (server-side implementation)"
+HOMEPAGE="http://ownpaste.rtfd.org/ http://pypi.python.org/pypi/ownpaste"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+		einfo 'building documentation'
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/www-apps/ownpaste/ownpaste-0.2.2.ebuild b/www-apps/ownpaste/ownpaste-0.2.2.ebuild
deleted file mode 100644
index 802eb87355e1..000000000000
--- a/www-apps/ownpaste/ownpaste-0.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ownpaste-0.2.2.ebuild,v 1.3 2012/12/26 23:30:45 ottxor Exp $
-
-EAPI=4
-
-PYTHON_COMPAT="python2_7"
-
-HG_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	HG_ECLASS="mercurial"
-	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
-fi
-
-inherit python-distutils-ng ${HG_ECLASS}
-
-DESCRIPTION="Private pastebin (server-side implementation)"
-HOMEPAGE="http://ownpaste.rtfd.org/ http://pypi.python.org/pypi/ownpaste"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-RDEPEND="dev-python/setuptools
-	>=dev-python/flask-0.8
-	>=dev-python/flask-script-0.3.3
-	>=dev-python/flask-sqlalchemy-0.15
-	>=dev-python/jinja-2.6
-	>=dev-python/werkzeug-0.8
-	>=dev-python/sqlalchemy-migrate-0.7.2
-	dev-python/pygments
-	dev-python/pytz"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	python-distutils-ng_src_compile
-
-	if use doc; then
-		einfo 'building documentation'
-		emake -C docs html
-	fi
-}
-
-src_install() {
-	python-distutils-ng_src_install
-
-	if use doc; then
-		einfo 'installing documentation'
-		dohtml -r "${S}/docs/_build/html/"*
-	fi
-}
diff --git a/www-apps/ownpaste/ownpaste-9999.ebuild b/www-apps/ownpaste/ownpaste-9999.ebuild
index 878d58fff142..0976ebe2b81a 100644
--- a/www-apps/ownpaste/ownpaste-9999.ebuild
+++ b/www-apps/ownpaste/ownpaste-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ownpaste-9999.ebuild,v 1.4 2012/12/26 23:30:45 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ownpaste-9999.ebuild,v 1.5 2013/07/24 17:48:45 mgorny Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 
 HG_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
 fi
 
-inherit python-distutils-ng ${HG_ECLASS}
+inherit distutils-r1 ${HG_ECLASS}
 
 DESCRIPTION="Private pastebin (server-side implementation)"
 HOMEPAGE="http://ownpaste.rtfd.org/ http://pypi.python.org/pypi/ownpaste"
@@ -28,32 +28,27 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 fi
 
-RDEPEND="dev-python/setuptools
-	>=dev-python/flask-0.8
-	>=dev-python/flask-script-0.3.3
-	>=dev-python/flask-sqlalchemy-0.15
-	>=dev-python/jinja-2.6
-	>=dev-python/werkzeug-0.8
-	>=dev-python/sqlalchemy-migrate-0.7.2
-	dev-python/pygments
-	dev-python/pytz"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	python-distutils-ng_src_compile
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+python_compile_all() {
 	if use doc; then
 		einfo 'building documentation'
 		emake -C docs html
 	fi
 }
 
-src_install() {
-	python-distutils-ng_src_install
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
 
-	if use doc; then
-		einfo 'installing documentation'
-		dohtml -r "${S}/docs/_build/html/"*
-	fi
+	distutils-r1_python_install_all
 }