From: Christian Ruppert Date: Sat, 17 Sep 2011 21:15:08 +0000 (+0000) Subject: Version bump. Use PYTHON_USE_WITH. Move/Migrate $EROOT/var/lib/layman/overlays.xml... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=becb1ff0996927a237dd29df3e5842c0bb50fadf;p=gentoo.git Version bump. Use PYTHON_USE_WITH. Move/Migrate $EROOT/var/lib/layman/overlays.xml to .../installed.xml. Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index 0bde9578748b..97974aa09297 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/layman # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.146 2011/08/12 01:46:26 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.147 2011/09/17 21:15:08 idl0r Exp $ + +*layman-2.0.0_rc3 (17 Sep 2011) + + 17 Sep 2011; Christian Ruppert +layman-2.0.0_rc3.ebuild, + layman-9999.ebuild: + Version bump. Use PYTHON_USE_WITH. Move/Migrate + $EROOT/var/lib/layman/overlays.xml to .../installed.xml. 12 Aug 2011; Paul Varner layman-9999.ebuild: Update with Gentoo Prefix modifications diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest index 9c8f8a8d5217..7195e8caa9ec 100644 --- a/app-portage/layman/Manifest +++ b/app-portage/layman/Manifest @@ -1,13 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX layman-1.4.2-python-compatbility-fix.patch 7866 RMD160 4a83751b0548ab6ca8402babc86bf4cba9cb2f56 SHA1 70b4598cc2d0b3cecd63b17f36cdf83ad111b5a6 SHA256 6fc94c2954e66119817601fa072042c982def676f41a21bf164bd97d47025add AUX layman-2.0.0_rc1-fix-mistracking-success.patch 2698 RMD160 90003540b90f66de32e62ab3b8c82ed226643369 SHA1 ba08b23a7f51978b33ba02acff97cf8c0c86b78d SHA256 723dcd1c8574e9c1cfbb098c4b866f41d7e42833202202adfd9e6bee3efda156 DIST layman-1.4.1.tar.gz 59960 RMD160 01cf082089c346696df52960412ed26ce06afe4a SHA1 62470af3569b84fbef5368a69337c320e5236010 SHA256 6dfa2a99b6ec4ee2f7a0a9f1e293dbb1bf2a52e408098aebd5031d93f8c4f248 DIST layman-1.4.2.tar.gz 60655 RMD160 e8144dcbd9800164aeae96c485ff58b389845dfe SHA1 d66cb7c8054dbacd3a269edf987604d07520fb46 SHA256 a10418aa33f4f849c190b5c15b37abac81058858be3cb107d084057cef56ccfd DIST layman-2.0.0_rc1.tar.gz 70796 RMD160 d2d377b4930c8c630939bf929bdc609744d9689e SHA1 4fa9ade163d0c2b1c4f7fda3223da4f6c46d067c SHA256 20587f6410d544a70616f24705ea5dbdacc17e929109e307083d14d272dcbb02 DIST layman-2.0.0_rc2.tar.gz 74170 RMD160 06215f4f4f1dbe88262ac248eedda1aa97bb9329 SHA1 ed753645318f0477d9b07f25f98f00bf091632be SHA256 f0430c6768b30b0a04d56ace43bd663ebc52160540e00f3d76305caffc037fa4 +DIST layman-2.0.0_rc3.tar.gz 74440 RMD160 14251717649b62bf2a722d5b97ffb0f1348ac9c1 SHA1 5598bd7cb4c506246c1a8c9a6d56df8613abcddf SHA256 fcbf59924f2fa62ef16ace2b4d66f9677c57396209b9c41a3548486f8d7453ab EBUILD layman-1.4.1.ebuild 2220 RMD160 f4099ff91ec3629415ca840684ad585aa44fc765 SHA1 269ea0ea367b76fce597a90d55f2650337011ae9 SHA256 2fe3c6c4e8d20ad1c9506b0a414d7b2bc4a4e153931089bbbbe9d49f24b9f1d5 EBUILD layman-1.4.2-r2.ebuild 2350 RMD160 aa857fcce59b2e7edb5a261626f63fcf09fa3e6a SHA1 b2e72bf5a44c7e1fe4fb824a86d95c886218fbf5 SHA256 c5399f0f4be804cbe1054c366655d88e34814fecb68c28434e4929e9b9464c01 EBUILD layman-2.0.0_rc1-r1.ebuild 2604 RMD160 2ade8a43c517f249636acfba9bfafb5c67312570 SHA1 538a4adc709a8a04568478c6a294d3cb1a247d0c SHA256 8fc9a49f7edbe154d93aa5ca349cf1c075257cafebb120cf303b31cc7c1b0d7e EBUILD layman-2.0.0_rc2.ebuild 2432 RMD160 e1c5de1ddf7db212d65e0ddc56ec554a9ce9fb0d SHA1 ac23f006ca1957bbf72b9417ad43520e888c3302 SHA256 43269be26c2902baa1aab077bfee8e84b71e01d6518d2c47c348be9dfd3f6de1 -EBUILD layman-9999.ebuild 2399 RMD160 d981cbab336a6fb0c6642a2a1068df8e0a791b37 SHA1 1f02100abda39663008a450084506c6b2ba50663 SHA256 1c63e012231248fef9163eface1271c318db1d3a0f348c70d6541c7102550540 -MISC ChangeLog 21808 RMD160 b6f27e7315c23f4d46ef32666474fecdb994ba80 SHA1 94ad76a3118c261f74623bfe71f676860cd7351e SHA256 9ea31d8707cc1c6ecbb9ff32da3f7107661fe7f105bc65a52a2dc83650d94844 +EBUILD layman-2.0.0_rc3.ebuild 2801 RMD160 a8510e0ba4f85e0b1c492a2dd9b11d91b710ed54 SHA1 e3babaafd94687db0c59f15d9a93912ad3d394d1 SHA256 0a483b5dd78b60130fba8378cb118f0ba686e9889e6d01449452db8f540027ae +EBUILD layman-9999.ebuild 2768 RMD160 a3d7493f8e86668e0a81e0979328c44b214fe2ec SHA1 294d3f7734f02d3738a1df5a1366e8c7a4e25fb7 SHA256 486fb708405dab9660f4630ecf5a79cb6f672b6ce82213db4e38f608fd88a98b +MISC ChangeLog 22048 RMD160 64ead9674c25085873f41336604ce76fee5862e1 SHA1 cfa3162187b8a97cb94c3f72c3344f36fbdb7859 SHA256 4631e22a3dcb9deba3dde6c8486e08dba998c6725c793a412218f3bad32c3351 MISC metadata.xml 756 RMD160 3659553fed97aec8d38202e4e8753c9fba845493 SHA1 914504bda21647e11d258f2b2e6e955b8571e455 SHA256 04c1d9b81309254232aabeedc973e1f4c9f7300fdeeb95d364846f4c98bc347c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQEcBAEBCAAGBQJOdQ3iAAoJEMOx0zmdw4Z1SvwH/ign6uUfokz3oFbFuEmh52VG +nt9oCJItUR9MQJsuetSgUEMJBFXfOdsvopqdBX4lns90PThAbEB7JpftbX3sq5a4 +MIB84LT19xqvmc0kiuwMXWWvZnepFLStERd2QksfI/c2z0QxvAe194Wbl8m/xI+i +0YSLVi3PFaKV/qpP5CqdfNn4DrCN/jHzN14NweG1GTAMqGAEukvIfUdsxa4cgi/1 +Eih0HQIVdeI8aowCKKiN3a7ud1bOeBg8uGfrjo64hKI5T0hY76HK7yoXwvq6UnGQ +k7YkZrM/cgYp2rIpi+X7ZADho3t+P9ioDTUUjPBl/SD0qrRCtYBBk/RF30adftk= +=T1TF +-----END PGP SIGNATURE----- diff --git a/app-portage/layman/layman-2.0.0_rc3.ebuild b/app-portage/layman/layman-2.0.0_rc3.ebuild new file mode 100644 index 000000000000..b1f9365ff40a --- /dev/null +++ b/app-portage/layman/layman-2.0.0_rc3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc3.ebuild,v 1.1 2011/09/17 21:15:08 idl0r Exp $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="2:2.6" +RESTRICT_PYTHON_ABIS="2.4 3.*" +PYTHON_USE_WITH="xml" + +inherit eutils distutils prefix + +DESCRIPTION="Tool to manage Gentoo overlays" +HOMEPAGE="http://layman.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="bazaar cvs darcs git mercurial subversion test" + +COMMON_DEPS="dev-lang/python" +DEPEND="${COMMON_DEPS} + test? ( dev-vcs/subversion )" +RDEPEND="${COMMON_DEPS} + bazaar? ( dev-vcs/bzr ) + cvs? ( dev-vcs/cvs ) + darcs? ( dev-vcs/darcs ) + git? ( dev-vcs/git ) + mercurial? ( dev-vcs/mercurial ) + subversion? ( + || ( + >=dev-vcs/subversion-1.5.4[webdav-neon] + >=dev-vcs/subversion-1.5.4[webdav-serf] + ) + )" + +src_prepare() { + eprefixify etc/layman.cfg layman/config.py +} + +src_test() { + testing() { + for suite in layman/tests/{dtest,external}.py ; do + PYTHONPATH="." "$(PYTHON)" ${suite} \ + || die "test suite '${suite}' failed" + done + } + python_execute_function testing +} + +src_install() { + distutils_src_install + + insinto /etc/layman + doins etc/layman.cfg || die + + doman doc/layman.8 + dohtml doc/layman.8.html + + keepdir /var/lib/layman +} + +pkg_postinst() { + distutils_pkg_postinst + + ewarn "The installed db file '%(storage)/overlays.xml'" + ewarn "has been renamed to '%(storage)/installed.xml'" + + if "${EROOT}/var/lib/layman/overlays.xml"; then + mv "${EROOT}/var/lib/layman/overlays.xml" "${EROOT}/var/lib/layman/installed.xml" + einfo "${EROOT}/var/lib/layman/overlays.xml has been moved to ${EROOT}/var/lib/layman/installed.xml" + fi + + einfo "You are now ready to add overlays into your system." + einfo + einfo " layman -L" + einfo + einfo "will display a list of available overlays." + einfo + elog "Select an overlay and add it using" + elog + elog " layman -a overlay-name" + elog + elog "If this is the very first overlay you add with layman," + elog "you need to append the following statement to your" + elog "/etc/make.conf file:" + elog + elog " source /var/lib/layman/make.conf" + elog + elog "If you modify the 'storage' parameter in the layman" + elog "configuration file (/etc/layman/layman.cfg) you will" + elog "need to adapt the path given above to the new storage" + elog "directory." + elog + ewarn "Please add the 'source' statement to make.conf only AFTER " + ewarn "you added your first overlay. Otherwise portage will fail." +} diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild index d645cb83af84..937613cd3f55 100644 --- a/app-portage/layman/layman-9999.ebuild +++ b/app-portage/layman/layman-9999.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.21 2011/08/12 01:46:26 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.22 2011/09/17 21:15:08 idl0r Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" PYTHON_DEPEND="2:2.6" RESTRICT_PYTHON_ABIS="2.4 3.*" +PYTHON_USE_WITH="xml" inherit eutils distutils git-2 prefix @@ -19,7 +20,7 @@ SLOT="0" KEYWORDS="" IUSE="bazaar cvs darcs git mercurial subversion test" -COMMON_DEPS="dev-lang/python[xml]" +COMMON_DEPS="dev-lang/python" DEPEND="${COMMON_DEPS} test? ( dev-vcs/subversion ) app-text/asciidoc" @@ -71,6 +72,14 @@ src_install() { pkg_postinst() { distutils_pkg_postinst + ewarn "The installed db file '%(storage)/overlays.xml'" + ewarn "has been renamed to '%(storage)/installed.xml'" + + if "${EROOT}/var/lib/layman/overlays.xml"; then + mv "${EROOT}/var/lib/layman/overlays.xml" "${EROOT}/var/lib/layman/installed.xml" + einfo "${EROOT}/var/lib/layman/overlays.xml has been moved to ${EROOT}/var/lib/layman/installed.xml" + fi + einfo "You are now ready to add overlays into your system." einfo einfo " layman -L"