diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-08-07 19:29:42 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-08-07 19:29:42 +0000 |
| commit | 95006d8170b4878884a33c7aad46aaf46b55a7bd (patch) | |
| tree | ff7fbd03b12af8be37c82cf626d65d98aa28c895 /sys-apps | |
| parent | Version bump (diff) | |
| download | gentoo-2-95006d8170b4878884a33c7aad46aaf46b55a7bd.tar.gz gentoo-2-95006d8170b4878884a33c7aad46aaf46b55a7bd.tar.bz2 gentoo-2-95006d8170b4878884a33c7aad46aaf46b55a7bd.zip | |
Update repos.conf migration code to handle CVS checkouts corrrectly.
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.13.5.ebuild | 10 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2.0_alpha194.ebuild | 10 |
3 files changed, 23 insertions, 3 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 88ad16f11f05..edcedc35dd56 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1335 2013/08/04 22:40:53 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1336 2013/08/07 19:29:42 floppym Exp $ + + 07 Aug 2013; Mike Gilbert <floppym@gentoo.org> portage-2.1.13.5.ebuild, + portage-2.2.0_alpha194.ebuild: + Update repos.conf migration code to handle CVS checkouts corrrectly. *portage-2.2.0_alpha194 (04 Aug 2013) diff --git a/sys-apps/portage/portage-2.1.13.5.ebuild b/sys-apps/portage/portage-2.1.13.5.ebuild index 80e6df009b76..c27c4a932bd4 100644 --- a/sys-apps/portage/portage-2.1.13.5.ebuild +++ b/sys-apps/portage/portage-2.1.13.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.5.ebuild,v 1.1 2013/08/04 22:39:05 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.5.ebuild,v 1.2 2013/08/07 19:29:42 floppym Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -460,6 +460,11 @@ pkg_postinst() { local sync_type= [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git + if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then + sync_type=cvs + REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} + fi + cat <<-EOF > "${T}/repos.conf" [DEFAULT] main-repo = ${repo_name:-gentoo} @@ -469,6 +474,9 @@ pkg_postinst() { sync-type = ${sync_type:-rsync} sync-uri = ${REPOS_CONF_SYNC} EOF + + [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" + local dest=${ROOT}/etc/portage/repos.conf if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then dest=${ROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf diff --git a/sys-apps/portage/portage-2.2.0_alpha194.ebuild b/sys-apps/portage/portage-2.2.0_alpha194.ebuild index 2c0e3da73010..031d1b8f6ced 100644 --- a/sys-apps/portage/portage-2.2.0_alpha194.ebuild +++ b/sys-apps/portage/portage-2.2.0_alpha194.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha194.ebuild,v 1.1 2013/08/04 22:40:53 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha194.ebuild,v 1.2 2013/08/07 19:29:42 floppym Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -483,6 +483,11 @@ pkg_postinst() { local sync_type= [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git + if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then + sync_type=cvs + REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} + fi + cat <<-EOF > "${T}/repos.conf" [DEFAULT] main-repo = ${repo_name:-gentoo} @@ -492,6 +497,9 @@ pkg_postinst() { sync-type = ${sync_type:-rsync} sync-uri = ${REPOS_CONF_SYNC} EOF + + [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" + local dest=${EROOT}/etc/portage/repos.conf if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then dest=${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf |