diff options
| -rw-r--r-- | app-portage/layman/ChangeLog | 8 | ||||
| -rw-r--r-- | app-portage/layman/Manifest | 8 | ||||
| -rw-r--r-- | app-portage/layman/layman-2.0.0_rc3.ebuild (renamed from app-portage/layman/layman-2.0.0_rc2.ebuild) | 14 | ||||
| -rw-r--r-- | app-portage/layman/layman-9999.ebuild | 13 |
4 files changed, 34 insertions, 9 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index 570f2ba..ec2efd5 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.144 2011/08/08 16:28:35 darkside Exp $ +*layman-2.0.0_rc3 (17 Sep 2011) + + 17 Sep 2011; Christian Ruppert <idl0r@gentoo.org> +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. + + 17 Sep 2011; Brian Dolbec <brian.dolbec@gmail.com> -layman-2.0.0_rc2.ebuild 11 Aug 2011; Brian Dolbec <brian.dolbec@gmail.com> layman-9999.ebuild: fix RESTRICT_PYTHON_ABIS statement, remove 2.5 restriction. diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest index 3e8a038..422d374 100644 --- a/app-portage/layman/Manifest +++ b/app-portage/layman/Manifest @@ -1,5 +1,5 @@ -DIST layman-2.0.0_rc2.tar.gz 74170 RMD160 06215f4f4f1dbe88262ac248eedda1aa97bb9329 SHA1 ed753645318f0477d9b07f25f98f00bf091632be SHA256 f0430c6768b30b0a04d56ace43bd663ebc52160540e00f3d76305caffc037fa4 -EBUILD layman-2.0.0_rc2.ebuild 2436 RMD160 639ce695eb019e6915a2a50c84c613f45493d53e SHA1 d81510a552790918df93fbfd7c1281dd32b92b14 SHA256 c89a2de61bbd76aa077f9668c9087c9fbb3cb89aec9c23a593a1f49ec5c694ff -EBUILD layman-9999.ebuild 2396 RMD160 ce1a597a213d6fec4812050fc0d48e9bcea3f844 SHA1 2444dff3e6e8721720ecf2a3d24a341b6b85a41f SHA256 ae68bf30c9a2d5bc5cc11fba0530b10dfb4fb8e808a307750e09f04ef94392d2 -MISC ChangeLog 21989 RMD160 cca995ae7cbc34dd693da14bf608e2ff188bcc82 SHA1 c3cb8eb90c9ad2141548d69136f965c837eed2fc SHA256 6079dbab8958bf683aa7b01c51b0f11f56c8f33c30493da1faa9cfcaba4a1e2e +DIST layman-2.0.0_rc3.tar.gz 74440 RMD160 14251717649b62bf2a722d5b97ffb0f1348ac9c1 SHA1 5598bd7cb4c506246c1a8c9a6d56df8613abcddf SHA256 fcbf59924f2fa62ef16ace2b4d66f9677c57396209b9c41a3548486f8d7453ab +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 22311 RMD160 7f0ee25d65d636fa4e6b2968a554dbace82a320e SHA1 5e5c46a5efc3f0a8613c243c52398ae0444b4044 SHA256 a0250ff2981231e9e61534eb370b1c3e318cf0160afd4d3f801769440b402c29 MISC metadata.xml 912 RMD160 8d63f4e9672a7b15587026626802074a7b0e968b SHA1 00ffdacd3dcbd4e0652517628e9c932f32865a4a SHA256 67a4974996e495ff3f49e3874d9e1d6f4fe251e9e49d92385ef14d4f23550b10 diff --git a/app-portage/layman/layman-2.0.0_rc2.ebuild b/app-portage/layman/layman-2.0.0_rc3.ebuild index f23bc4c..b1f9365 100644 --- a/app-portage/layman/layman-2.0.0_rc2.ebuild +++ b/app-portage/layman/layman-2.0.0_rc3.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-2.0.0_rc1-r1.ebuild,v 1.6 2011/08/08 16:28:35 darkside Exp $ +# $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 @@ -18,7 +19,7 @@ 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[xml]" +COMMON_DEPS="dev-lang/python" DEPEND="${COMMON_DEPS} test? ( dev-vcs/subversion )" RDEPEND="${COMMON_DEPS} @@ -34,7 +35,6 @@ RDEPEND="${COMMON_DEPS} ) )" - src_prepare() { eprefixify etc/layman.cfg layman/config.py } @@ -64,6 +64,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" diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild index 3c17098..937613c 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.20 2011/07/18 14:52:55 idl0r 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" |