summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-08-03 10:15:01 +0000
committerZac Medico <zmedico@gentoo.org>2013-08-03 10:15:01 +0000
commit46da95524aeb5ed39fa6c4c1275966b7ea434100 (patch)
treea290318d83586d08b405201663553d61a470c2b3
parent2.1.13.3 version bump. This fixes bug #339446 (clarify phase dependency (diff)
downloadhistorical-46da95524aeb5ed39fa6c4c1275966b7ea434100.tar.gz
historical-46da95524aeb5ed39fa6c4c1275966b7ea434100.tar.bz2
historical-46da95524aeb5ed39fa6c4c1275966b7ea434100.zip
2.2.0_alpha192 version bump. This includes all of the fixes in 2.1.13.3.
Bug #210077 tracks all bugs fixed since portage-2.1.x. Package-Manager: portage-2.2.0_alpha192/cvs/Linux i686 Manifest-Sign-Key: 0xFDE8EF85AE5719A3
-rw-r--r--sys-apps/portage/ChangeLog9
-rw-r--r--sys-apps/portage/Manifest11
-rw-r--r--sys-apps/portage/portage-2.2.0_alpha192.ebuild (renamed from sys-apps/portage/portage-2.2.0_alpha190.ebuild)33
3 files changed, 44 insertions, 9 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 32b29bb8eb27..f82f2130d0df 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
# 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.1329 2013/08/03 10:12:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1330 2013/08/03 10:14:59 zmedico Exp $
+
+*portage-2.2.0_alpha192 (03 Aug 2013)
+
+ 03 Aug 2013; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha192.ebuild,
+ -portage-2.2.0_alpha190.ebuild:
+ 2.2.0_alpha192 version bump. This includes all of the fixes in 2.1.13.3. Bug
+ #210077 tracks all bugs fixed since portage-2.1.x.
*portage-2.1.13.3 (03 Aug 2013)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ce35f7376a5d..8041e870b8e4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,6 +15,7 @@ DIST portage-2.2.0_alpha177.patch.bz2 12456 SHA256 4a4659a0cadc7e92eee6304195861
DIST portage-2.2.0_alpha188.patch.bz2 64370 SHA256 d75c56425096507ed180f690849832c1970dcdeac96b6aa90cf97b29c7aaa91f SHA512 4fa84a75f2288ade7b3c02dc95f67dd32eb92b636f63ad365a3688708d2514f7819ea1b6fa19bbb27f047c10cd944940d03fe1a37d4bc348e2a2457cc7010507 WHIRLPOOL 30c82da2252100b50494399542fe45f652632005d310c89543b904c952fbd34ed2d1b370f4b02fa5e53f79e1007c78dd7775af761f5a08608fc9614a68ac6e82
DIST portage-2.2.0_alpha190.tar.bz2 892695 SHA256 a1d20df4240662661deb23b957c53f1e22253517bccd7c28a08356ed2e663df5 SHA512 3c89ffe9b1817580e129031b98cf03f2c77b0bd0915a5c596a2e4da566d27ba5736ec3aba95e9f0e9719c6ceb4a0208962c0a8e1bd0f25da7ac4f3718d4cc93a WHIRLPOOL 1207122c3737d79f030c4cbc069777f77bd153c1bd60c6b1e1a77d7e1137c8e73e77c1fd9abcfcd6918cebc1b0932c674f81195ad8d0b882e7ec32631355785c
DIST portage-2.2.0_alpha191.patch.bz2 6347 SHA256 62ef1e47d322e3993d5bfd21e64d03c1ca36419d0362271f79b4d22aec6f66f0 SHA512 6470a3eb99a084a86f2e90298a12d293bdc4b1481b6ef2b9ef39180dfed761ea05fd8e4fa47901013debf10e8556fb56520d53a5d0b0c2f4c80d2d1640fe5ac4 WHIRLPOOL 3fe3129d07805a00f64a0efb0509fff9da96000157cc5c269664d73053644af53509998ea00358b7d876fbf9827842586e9ec42c43fd055d13b8ed81cfa46aae
+DIST portage-2.2.0_alpha192.patch.bz2 42104 SHA256 25e2063ac59c1007fd98ec17c6d92fccb86dc9a6b72dd361d7a955b9e0cc2941 SHA512 cb59ee0cddcbbf142f61e1af37043312ea44f2075a5ca50e170e5cd43c1625e4620b04fd0e03c72e22fdb74cc0f71b28dda6037e4e5b12b81ed1cf5260ec9b2c WHIRLPOOL bc5faf207fe01e61b2b639a240d15a9fef5671893396da29c156478e092b1deeea7c85eef7de429ad79f1ee56d38c7b594aa65d5175837a71bca77ebeee90bc5
DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
EBUILD portage-2.1.11.62.ebuild 13579 SHA256 4ca79541f61fb0bd97289e521913b7cd5f65bb63c7442ef7f0b4dc0f507b863f SHA512 6cc21f6696b13f28db6ebdfab805b965b5455c44864a06ad5bec34193694ecba118427803ccb96957d64bd563c0120dd37cbc06642e60aeb1f7595a3dff94161 WHIRLPOOL 5c50a6f7909a0989599413b672a46d5732e7dd151da898dac6a3f465fc578504357b824964ae5843de21e90266a8b6f885dff256aa538a907aff8356cce77220
EBUILD portage-2.1.12.13.ebuild 14220 SHA256 b9e5c3d3f540f0a1f3faf033f155a6184d206ad7045a307fb72f3b91fba1098f SHA512 4d9c7cdd46738a36ffa070df7c0e6255f62636b84828807a4af0ca47d686b5eb700cb4dc8c1d929d3c8e52429aa377428e19e2d4feee26fc48a5d385b28c94ff WHIRLPOOL 7091a42e4937edd14a6f100f012692a245baad23c8c068d0dbefe316ba4931328dfe1a669f288f2762a8577b550bc53f96b1e218b4c88dd6ecf14e6345b86aa9
@@ -24,16 +25,16 @@ EBUILD portage-2.1.13.3.ebuild 17808 SHA256 3c4c58ecc64ca32c89abb7427a0ae0b448e2
EBUILD portage-2.1.6.7_p1.ebuild 8308 SHA256 5c5c52664f4d3a09679d09d4ab060c52752e4f1f8b5d86c2e60c20c9a9c6655b SHA512 582549d643094f08fced94741b474d38bef9f7605aaa3b8308138b32ad331424d62019b172635639e7a2dc00b02d2f2fd3dd1507fdee36bb300a79459e7cd4ce WHIRLPOOL 62e3fd88109b1d2563fd875a1afada9cbb1fb1721b5d4f73bc361a5389f85e1c985960106123c9aaa8545cef1bc7d877c307a7610dd7749b10524aac055168ca
EBUILD portage-2.2.0_alpha177.ebuild 15614 SHA256 e27b1114dbc2549ea485ea5328ce784bc8ee00a07d3d944b7e12b94fcb9b6489 SHA512 d72bc7841bbc18df28d18084d41472c5f6b5e73ad0f20e8121b2694ff83b041b46db327acd76e557fc07fd879ecfa19b6ebfd775699c2c4fb03683e4dccc3fdf WHIRLPOOL 22450f30c9b5456b031ba30c041dabd4ee35f23d28ffb91654a334bfb7d67b6094bf5852e9b37f3c21441e86b6b6dc2a723932ca5b3bcb05048d424f6a63b146
EBUILD portage-2.2.0_alpha188.ebuild 15339 SHA256 ef820ac474387bd5a9d852fe6762f8b41b150b66a6976a9d3b81087c1bbb8e6f SHA512 093defdb436f1685a845554e85279828b9ad1f0855fcef42d327298a947ee32f85db3f2372b36a321efd7fa49bc8ae7734f2b2884e26e3680bc6ea2e3801be9f WHIRLPOOL b2691a8e527a2a1ad9ef4e6f10075e9ee6b5f91b7268ea5dcca24cb557c721708b025d3d4a5bda9b7805cffba0920e4de31d1b85e473d965bf1b81d0cc130ad2
-EBUILD portage-2.2.0_alpha190.ebuild 17889 SHA256 2836eb723e1cfd062330395ed3fc546437b78d51c31b01e7b0ed004c5452f4c3 SHA512 a822068000e5acb0c4b35c4019f957a142aa66668f33acf8a29ae7e47a6bf5fb299a448e5733a64d92829c60802212f2e2034462c09613f33ce2b667e724848d WHIRLPOOL 07a9d7c7d065122d6b3e2683873390eb798102f9a5a1b7ff0be229d83b545aeb1d893bd25123ec0bb61b487f3f4220ea0b6a09b2719a0e287ee5a601aa435787
EBUILD portage-2.2.0_alpha191.ebuild 18935 SHA256 6fdb09c504f1350061d36ea9e06de30e6336a6f957f52fedd1265e4e152b98fb SHA512 3ae4bc5415e18693fd434ee0a023e9046f66360c0411765466e1fd513022922c604f66e43630d0844695faeb414e69ccaa8aea02463cbf163338c65dcc734645 WHIRLPOOL d5a4505e1873cfff8619562c4d6a52fdc068b80127ac9b787423886efe73dc980c4eeb4e5fbdd7a2d24c452ce64591862009428e7651eff6db50b4e4f8dac2ac
+EBUILD portage-2.2.0_alpha192.ebuild 18935 SHA256 ed808c2bb787ae59bd42c2929a473af102cf1887f09a4b2992e6cb95fc867f6d SHA512 fc20db932a8e9f779d2133c2f18309faf22c0273064e446a6e33a9776268bd23acacda453e38ad7a877d8f5290063215058fc320a0a62a257b4f0ba3e1808722 WHIRLPOOL 0e56f7f463973e2c376efa825c868f9ba0ecf199508e3d99dcacf0faf32a3304fe1df0fd3ab4437ce24477b939aec1c8f8733efdc56ddd342da04c12aed97291
EBUILD portage-9999.ebuild 13747 SHA256 3d6bbc4177de0644353c9f9a2b4c1afdaa3a3bb51961cbac13624a8ac51e89ce SHA512 8490e08a319f48cf4ad901facc080a26caa06997c3827149a163cb14f4359c2bee461125b40251044a8d7b7628a412aae4afafae62db0ef5d1521f4f3e0b7840 WHIRLPOOL 38b4845c2a5d4e0b8fdf8408aad0a93b3a335b69cab9a7eb004cc6b6eacab1e7483eee8e15bfbc729b6b9b910a4cb1b0c9786f29adbdd079395ecbda33297e86
-MISC ChangeLog 42910 SHA256 bfcdd432e174ca9f59fc6362b1790073f699ff41889f67c70424ee296750cd80 SHA512 1484221d56cf74e0a90549cdc25fb8bcf7bc626f8fc64dd387121e476313dd32ac08309464435cfe5774896abbd0636401f7afbb6f3498293cf6e37eebcc43b1 WHIRLPOOL def4760b713ccf69171dec8607d4b4c780174cd0ebc9f797bfd3c69f8fb01a5a43fcebe783c08b1da7cf8014b9ab5dd7899ac7b41bbfd5f2af04c499410003a6
+MISC ChangeLog 43195 SHA256 13d032c261852544ed18cfa5c86803dafac8e5683eb0e35214756fd4d11757b7 SHA512 1e38d299914d593b85ae08329a1095519cfe6b4e9655c19755792f671cd5ad3b4a813829f233ace8f6e05cc2db85122dae535cf333fd7f4ed0c1168e23bac408 WHIRLPOOL def468b0d2e1897976028bcc8163bdc9a8398afba0d56b469e06284545fcc5515aa61fde0ccb9686ba214829d2690e5396d21cd6e07bbc135d8962426243c1e6
MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
MISC metadata.xml 957 SHA256 f03704594ee4694b60fcba3df6a5d813a849a9d3454fc902d974555eeea79d3d SHA512 958d90bc465e1a49aec7f0f649bf1026fb8f28811210223cf4149e32bab96695997049d42b12827487f2b5a4f0e2b51a2431dba01fe373d36199a32ab02e6765 WHIRLPOOL 5cb0e38bbfd0b7e7929c4c0167027ce07c5a8fa535c52906b2a2936897be37472be7430f0335aaff5931ae99ca89939047ecb997b172ae2187ae5949f10e1c8a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlH815YACgkQ/ejvha5XGaPjMACeN4p9aDUy5FZvTzhxgkxPrU/r
-e3YAn2yrcLFDoHsy11YZ7zhGJsxOB69Z
-=fZ4l
+iEYEAREIAAYFAlH82CQACgkQ/ejvha5XGaPGngCgtjKunOHyqYzWhat2Dq2S+zHf
+EMMAnjrjBdWxWSFagddnnCbbdeyRVeA+
+=EFsh
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.0_alpha190.ebuild b/sys-apps/portage/portage-2.2.0_alpha192.ebuild
index 7c1da589c357..5fe3fecdcc09 100644
--- a/sys-apps/portage/portage-2.2.0_alpha190.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha192.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_alpha190.ebuild,v 1.3 2013/07/29 17:53:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha192.ebuild,v 1.1 2013/08/03 10:14:59 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,20 +480,47 @@ 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
if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
dest=${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
fi
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+ # Don't install the config update if the desired repos.conf directory
+ # and config file exist, since users may accept it blindly and break
+ # their config (bug #478726).
+ [[ -e ${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+ mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+ if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+ einfo "Generating make.conf PORTDIR setting for backward compatibility"
+ for dest in "${EROOT}/etc/make.conf" "${EROOT}/etc/portage/make.conf" ; do
+ [[ -e ${dest} ]] && break
+ done
+ [[ -d ${dest} ]] && dest=${dest}/portdir.conf
+ rm -rf "${T}/make.conf"
+ [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+ cat <<-EOF >> "${T}/make.conf"
+
+ # Set PORTDIR for backward compatibility with various tools:
+ # gentoo-bashcomp - bug #478444
+ # euse - bug #474574
+ # euses and ufed - bug #478318
+ PORTDIR="${EPREFIX}/usr/portage"
+ EOF
+ mkdir -p "${dest%/*}"
+ mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+ fi
fi
if ${NEEDED_REBUILD_UPGRADE} ; then