Synchronize metagen-9999 with metagen-0.5.2.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/app-portage/metagen/ChangeLog b/app-portage/metagen/ChangeLog
index 396aa9b4949bd933975931b5e0c3fbef31de98ab..1193a2300c52afe48d54856edf36531601b96c2a 100644 (file)
--- a/app-portage/metagen/ChangeLog
+++ b/app-portage/metagen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/metagen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/ChangeLog,v 1.21 2010/06/07 11:03:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/ChangeLog,v 1.22 2010/06/11 22:13:10 arfrever Exp $
+
+  11 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  metagen-0.3.ebuild, metagen-0.5.ebuild, metagen-9999.ebuild:
+  Fix deprecation warnings.
 
   07 Jun 2010; Markos Chandras <hwoarang@gentoo.org> metagen-0.5.2.ebuild:
   Stable on amd64 wrt bug #322781

diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index bc888da44ff2b1869d86687b6518d2596bc6a9b8..764b524f8799bb31f79cdb606bc166fb8a6d5c80 100644 (file)
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -2,8 +2,8 @@ DIST metagen-0.3.tar.bz2 3590 RMD160 dea3dd9ebe3c82838eee05acdf4bf42ba69da7e0 SH
 DIST metagen-0.5.2.tar.gz 6004 RMD160 c5c577d2752773d2ca6f93996f5093b230699e3d SHA1 602c98330fcad9910304b8d81428a1d8a7aa5783 SHA256 d12ed1086b237dcfc9c7c9b6b259b67a74bebba22b3aa4965fd8dad77fc91be3
 DIST metagen-0.5.tbz2 7116 RMD160 d9e15107bff6533f11f6d1ad365760ca46804588 SHA1 5608d8a15f7227c6bb54c5f0fede26dd0676e3b5 SHA256 499c3ec42688b8cdd56e77bc74dbdb18c34a55b8b9a945034b0f20975deaf4d3
 EBUILD metagen-0.3.ebuild 719 RMD160 6a27614113281752dc183548277227c364ebbedd SHA1 cd8d685996ec5b16f150dc36e11e661527a846e6 SHA256 8ead1c9388d92cbc8020cd0cad68d3d34ca0017655ffc51fb13e6813e88e80ea
-EBUILD metagen-0.5.2.ebuild 1129 RMD160 e30551612e945f6e52b8fab8572120415fc95d11 SHA1 660c6599e621b1debe3af7b9f1287e9d8f3b4bd0 SHA256 bc9a3fd0672a2724e25d0c12d0586d6be7fe8ab4461407c67078fa688fcccfab
-EBUILD metagen-0.5.ebuild 923 RMD160 412b748cdfb243910cdae8ca6c426ec101952ae3 SHA1 1d46ba93d80f7b4064ff0edf89056ec8d9f1e782 SHA256 a81883cbeecccbea3e2f891a5fe6a46fd00e697be39f6a6e0166c36e489e8a76
-EBUILD metagen-9999.ebuild 1112 RMD160 542ba949748f69a1d662511e96e07023a0687ab9 SHA1 c8c54e473e3f2b2234d697e1f7034d7e4402e82f SHA256 4ddf96aa9010baf914d6b4b5b3f0081d5672f91c51de846e254334cc3b3cc200
-MISC ChangeLog 2627 RMD160 373ab2b89b22ac3b57771524109e774381ca3b47 SHA1 02462e1f73acd162f8a7cbe3c7745e3587ab1f9d SHA256 c8cb1d802ca6fc4f50e9da2da5f97dc766c7e60dc1d5850c3b1c166446f49069
+EBUILD metagen-0.5.2.ebuild 1120 RMD160 964ced6d1a24729dbbf6fbcbc6830c14e5f09ead SHA1 9339247f7c5366645a87f4a6d74c084f81ab7952 SHA256 f92385fc2ca313b7e889e1e8b7e392457187eb79dd67525c8fd482eacdecf06b
+EBUILD metagen-0.5.ebuild 923 RMD160 3ff46759bfa4e7400a7d2abe7b36d487777971ea SHA1 a38c1fd1200ba6c5ec6a8893de7e3f2335e276d2 SHA256 8c90e415ddb2ae58e970f93080117051319894c5c88d048007245575feb28faf
+EBUILD metagen-9999.ebuild 1197 RMD160 577ef30c5a5e95d52685aee03573b1c9472571e0 SHA1 fcdb68f67d9991cb29426860c5fa30db9f5c363d SHA256 74ef7b31c597b8e28a68c497b22d0e9d2bbebe2f79d9e13f507941f39613979d
+MISC ChangeLog 2792 RMD160 d3955710d76ded84e2fa3963169b289b74e244d7 SHA1 9a49d160ceedebe6d0f4978f5ad1b7cdc4a384f8 SHA256 cc4ad2aaebdf15f5277e773f751c45b7e8b1792c2661fb28209b5fd3af5d0341
 MISC metadata.xml 513 RMD160 59df4ce739f7b3ddad362b0ef586ee4755a114c4 SHA1 ff0ae17355ee98a8e48cbb1ce5c815a70d93dd0b SHA256 b0a9fe175fd33e9326250b027559b8d90c1a640ab63b53c6a238a791376d9df5

diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index 9c0d64fb179e7ffb3bef9e53c745fcd1a908ba7a..c2e7ff3a5489ce4b4c35868792f5c461f63a5a35 100644 (file)
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,8 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-9999.ebuild,v 1.1 2010/03/22 23:16:35 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-9999.ebuild,v 1.2 2010/06/11 22:13:10 arfrever Exp $
 
-inherit git python
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils git
 
 DESCRIPTION="metadata.xml generator for ebuilds"
 HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary"
@@ -14,31 +19,33 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE=""
-DEPEND=">=dev-python/jaxml-3.01
-       >=dev-lang/python-2.3.3"
+DEPEND=">=dev-python/jaxml-3.01"
+
+src_prepare() {
+       distutils_src_prepare
+       git_src_prepare
+}
 
 src_install() {
-       python_version
-       dodir /usr/lib/python${PYVER}/site-packages/metagen
-       dodir /usr/bin
-       cp *py test_cli "${D}"/usr/lib/python${PYVER}/site-packages/metagen/
-       dosym "${D}"/usr/lib/python${PYVER}/site-packages/metagen/metagen.py \
-                       /usr/bin/metagen
-       doman metagen.1
-       dodoc docs/*
+       distutils_src_install
+
+       metagen_install() {
+               local METAGEN_MOD="$(python_get_sitedir)/${PN}/main.py"
+               fperms 755 ${METAGEN_MOD}
+               dosym  "${D}"${METAGEN_MOD} "/usr/bin/${PN}-${PYTHON_ABI}"
+       }
+       python_execute_function metagen_install
+
+       python_generate_wrapper_scripts "${ED}usr/bin/${PN}"
+
+       doman "docs/metagen.1"
 }
 
 src_test() {
        einfo "Starting tests..."
-       python -c "from metagen import metagenerator; metagenerator.do_tests()" \
-               || die "metagen tests failed"
+       testing() {
+               $(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()"
+       }
+       python_execute_function testing
        einfo "Tests completed."
 }
-
-pkg_postinst() {
-       python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-       python_mod_cleanup ${PN}
-}