diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-07-30 18:38:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-07-30 18:38:29 +0000 |
| commit | dc013e429a70958518a08cfe11d6b0582e5cbd58 (patch) | |
| tree | 8532867cf3261b24eba3b397885fb351ab96c704 /sys-apps | |
| parent | Properly fix bug 477316, also fixing bug 478034 that was caused by the ugly h... (diff) | |
| download | gentoo-2-dc013e429a70958518a08cfe11d6b0582e5cbd58.tar.gz gentoo-2-dc013e429a70958518a08cfe11d6b0582e5cbd58.tar.bz2 gentoo-2-dc013e429a70958518a08cfe11d6b0582e5cbd58.zip | |
Support git:// in pkg_postinst generated repos.conf.
(Portage version: 2.2.0_alpha191/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.13.2.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2.0_alpha191.ebuild | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 15ad020a614f..bbd9825ef7fd 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.1326 2013/07/30 07:03:31 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1327 2013/07/30 18:38:29 zmedico Exp $ + + 30 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-2.1.13.2.ebuild, + portage-2.2.0_alpha191.ebuild: + Support git:// in pkg_postinst generated repos.conf. *portage-2.2.0_alpha191 (30 Jul 2013) diff --git a/sys-apps/portage/portage-2.1.13.2.ebuild b/sys-apps/portage/portage-2.1.13.2.ebuild index 29afce196da7..466dc3c22109 100644 --- a/sys-apps/portage/portage-2.1.13.2.ebuild +++ b/sys-apps/portage/portage-2.1.13.2.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.2.ebuild,v 1.2 2013/07/30 07:01:10 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v 1.3 2013/07/30 18:38:29 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -457,13 +457,16 @@ pkg_postinst() { REPOS_CONF_SYNC=$(grep "^sync-uri =" "${ROOT}/usr/share/portage/config/repos.conf") REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } fi + local sync_type= + [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git + cat <<-EOF > "${T}/repos.conf" [DEFAULT] main-repo = ${repo_name:-gentoo} [${repo_name:-gentoo}] location = ${PORTDIR:-/usr/portage} - sync-type = rsync + sync-type = ${sync_type:-rsync} sync-uri = ${REPOS_CONF_SYNC} EOF local dest=${ROOT}/etc/portage/repos.conf diff --git a/sys-apps/portage/portage-2.2.0_alpha191.ebuild b/sys-apps/portage/portage-2.2.0_alpha191.ebuild index 06fd60a84c80..43b29cd1ea6d 100644 --- a/sys-apps/portage/portage-2.2.0_alpha191.ebuild +++ b/sys-apps/portage/portage-2.2.0_alpha191.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_alpha191.ebuild,v 1.1 2013/07/30 07:03:31 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha191.ebuild,v 1.2 2013/07/30 18:38:29 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -480,13 +480,16 @@ pkg_postinst() { REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf") REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } fi + local sync_type= + [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git + cat <<-EOF > "${T}/repos.conf" [DEFAULT] main-repo = ${repo_name:-gentoo} [${repo_name:-gentoo}] location = ${PORTDIR:-${EPREFIX}/usr/portage} - sync-type = rsync + sync-type = ${sync_type:-rsync} sync-uri = ${REPOS_CONF_SYNC} EOF local dest=${EROOT}/etc/portage/repos.conf |