summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-05 23:16:22 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-05 23:16:22 +0000
commitc3c4de513828a9eb5534f141ebd09edb8835421d (patch)
tree6dccdce5b77a7876b498c630421652e3bfcaa480 /sys-apps
parentRemove old ebuild. (diff)
downloadhistorical-c3c4de513828a9eb5534f141ebd09edb8835421d.tar.gz
historical-c3c4de513828a9eb5534f141ebd09edb8835421d.tar.bz2
historical-c3c4de513828a9eb5534f141ebd09edb8835421d.zip
2.1.2_pre2-r4 revbump. This fixes bugs #4698 and #93469.
Package-Manager: portage-2.1.2_pre2-r4
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/ChangeLog7
-rw-r--r--sys-apps/portage/Manifest30
-rw-r--r--sys-apps/portage/files/digest-portage-2.1.2_pre2-r412
-rw-r--r--sys-apps/portage/portage-2.1.2_pre2-r4.ebuild205
4 files changed, 238 insertions, 16 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 766f307f1a5a..5e30ebc9e1b6 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.261 2006/10/04 10:46:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.262 2006/10/05 23:16:22 zmedico Exp $
+
+*portage-2.1.2_pre2-r4 (05 Oct 2006)
+
+ 05 Oct 2006; <zmedico@gentoo.org> +portage-2.1.2_pre2-r4.ebuild:
+ 2.1.2_pre2-r4 revbump. This fixes bugs #4698 and #93469.
*portage-2.1.2_pre2-r3 (04 Oct 2006)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8555c271f927..2eb8289ced15 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,8 +17,8 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
-DIST portage-2.1.2_pre2-r2.patch.bz2 4141 RMD160 41405e6b2d863a5f4a3b596818f949f4de238043 SHA1 c0e4abb0b05141066e043408080828748b4edc88 SHA256 3a7490138ab242a290ac1e00c400627ffcf93582a6d1e08cf0eb7f52bfb1bd34
DIST portage-2.1.2_pre2-r3.patch.bz2 6246 RMD160 8f5bf3da796bb0575179f906e2f4a21bf38167a8 SHA1 ebdc22458ca014cf61158720a157a188ed1bd4c4 SHA256 164bb464ba528acee71ff20190c18b7f250501a2b7619840ee7a6f900dfda8aa
+DIST portage-2.1.2_pre2-r4.patch.bz2 8550 RMD160 9e32f27abe3dc59aa4a563dc58d58290dddf3a68 SHA1 39796251833ffb1f024a98c2741c78d6f758dbaf SHA256 85e0074ac5f5c015fb0b5f8c40140b76fdceaa903e6961d7ff0df6dd23d6cde7
DIST portage-2.1.2_pre2.tar.bz2 302712 RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 SHA1 11297373bc85c6b870ac04f711278d8ec0fffaeb SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3
DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -38,18 +38,18 @@ EBUILD portage-2.1.1.ebuild 6223 RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d
MD5 4ea59171eb61742c3894f253c040b584 portage-2.1.1.ebuild 6223
RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d portage-2.1.1.ebuild 6223
SHA256 e5cf6598da0ae949cd6e6ac07e8bf9881bbf352791503fbe50d04ce59358a830 portage-2.1.1.ebuild 6223
-EBUILD portage-2.1.2_pre2-r2.ebuild 6146 RMD160 8a5b8941a576d37809a095352660dbbb062d12bc SHA1 a34edaccac2ff28c44500d106e35a07dadc190c4 SHA256 42984c277eb6f1cb50d7f47a9b163bad957401e7dbe9abd6b0c5747db8ea2b92
-MD5 a078f37d65b8f11490d28f809800691e portage-2.1.2_pre2-r2.ebuild 6146
-RMD160 8a5b8941a576d37809a095352660dbbb062d12bc portage-2.1.2_pre2-r2.ebuild 6146
-SHA256 42984c277eb6f1cb50d7f47a9b163bad957401e7dbe9abd6b0c5747db8ea2b92 portage-2.1.2_pre2-r2.ebuild 6146
EBUILD portage-2.1.2_pre2-r3.ebuild 6146 RMD160 7b1425ec81f7781e5132da2ac295d0d63c6483a0 SHA1 d519498d0474c12dbc453257f8d25d11d1307998 SHA256 097fa1f13b950b0c5b3c5127a5284db753dcb2680e6a38c384a7b3c77dda3462
MD5 c9ac86876d09d9de69ad4a757c2bfb0f portage-2.1.2_pre2-r3.ebuild 6146
RMD160 7b1425ec81f7781e5132da2ac295d0d63c6483a0 portage-2.1.2_pre2-r3.ebuild 6146
SHA256 097fa1f13b950b0c5b3c5127a5284db753dcb2680e6a38c384a7b3c77dda3462 portage-2.1.2_pre2-r3.ebuild 6146
-MISC ChangeLog 15020 RMD160 6e885db052743f4e277bacf87d91bba3be8fc24b SHA1 1b45f334d67e733faa34d9d3e4621b71eceb2407 SHA256 c09d7881f197e464bb3bc36a50207ea8922823e5e04bea79968286ea018b1ea7
-MD5 51a1012175f4f9de610158792108c0f0 ChangeLog 15020
-RMD160 6e885db052743f4e277bacf87d91bba3be8fc24b ChangeLog 15020
-SHA256 c09d7881f197e464bb3bc36a50207ea8922823e5e04bea79968286ea018b1ea7 ChangeLog 15020
+EBUILD portage-2.1.2_pre2-r4.ebuild 6146 RMD160 dd0215c30781d82da0fba88c2c62f464671d1097 SHA1 a1d1242d2cda6ae46ae2d283d07caa55058a34e2 SHA256 0943fe678a3f97fba6d0ee7b0a34ad53ec88f5995c48802356cdc788801eebba
+MD5 5e624d1602e409609649b80e8e6998c2 portage-2.1.2_pre2-r4.ebuild 6146
+RMD160 dd0215c30781d82da0fba88c2c62f464671d1097 portage-2.1.2_pre2-r4.ebuild 6146
+SHA256 0943fe678a3f97fba6d0ee7b0a34ad53ec88f5995c48802356cdc788801eebba portage-2.1.2_pre2-r4.ebuild 6146
+MISC ChangeLog 15186 RMD160 513b716261ec0116c3bbb66064ad0c2ad749fa9d SHA1 abf87c89a71443aa2f7ce1193ea0200363d67aaf SHA256 9ef2c23431f523333fc48c5305a7116b25cec253e945517688ce77b9958d1fb5
+MD5 578aea8d8dab78067190b7044a6ed5e5 ChangeLog 15186
+RMD160 513b716261ec0116c3bbb66064ad0c2ad749fa9d ChangeLog 15186
+SHA256 9ef2c23431f523333fc48c5305a7116b25cec253e945517688ce77b9958d1fb5 ChangeLog 15186
MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -66,16 +66,16 @@ SHA256 54848742dff9ea07bf01d3fc8988a31a868faf590b33982ef6f3f81f87c97e0c files/di
MD5 84cc321543f8146e88db8ed6060d554f files/digest-portage-2.1.1-r1 1021
RMD160 6b1ee9d511161b46d6b844985a27a9e57fd48898 files/digest-portage-2.1.1-r1 1021
SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/digest-portage-2.1.1-r1 1021
-MD5 a6c977dc49cfaf5d60cf0eb171f4acce files/digest-portage-2.1.2_pre2-r2 1051
-RMD160 181da24517469951657f8a02346ba92d3ea1e8a6 files/digest-portage-2.1.2_pre2-r2 1051
-SHA256 b74abbe10846edca82214c08b4a2f2e1ef21f8e353cb50105da5d864f1a94272 files/digest-portage-2.1.2_pre2-r2 1051
MD5 58b661807163b02e69fd863587591696 files/digest-portage-2.1.2_pre2-r3 1051
RMD160 7407f80a1bc14f44c2c1eab7172b96a65aa53ffe files/digest-portage-2.1.2_pre2-r3 1051
SHA256 4359b9111ce866510feac0bebf14352b235857965168081f2bc00136713eccb3 files/digest-portage-2.1.2_pre2-r3 1051
+MD5 76ba2ce853dd121f7e47e436c701654b files/digest-portage-2.1.2_pre2-r4 1051
+RMD160 6ba26ccbd3aa56b18181cc4ced7de1cf08f49c24 files/digest-portage-2.1.2_pre2-r4 1051
+SHA256 2f362727a6a2cb9c3c8986c3583c934579af973284e05873a64fab0231a798a6 files/digest-portage-2.1.2_pre2-r4 1051
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFI5Ds/ejvha5XGaMRAr8jAKChopH1RyW10/gxDUIW8m00STTo5ACfVczD
-2OfcV1JS2xYjkXMqyPuIpos=
-=duNM
+iD8DBQFFJZJO/ejvha5XGaMRArHRAJ9ffdHJkYfIVwjLUlTO3+rtEK1XAwCeLMC4
+3Xra6yT7bYp1jLZc05KW+68=
+=t2mK
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r4 b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r4
new file mode 100644
index 000000000000..3c1e9dbe1f69
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r4
@@ -0,0 +1,12 @@
+MD5 c79e3c74c9a976f38634048214060a77 portage-2.1.2_pre2-r4.patch.bz2 8550
+RMD160 9e32f27abe3dc59aa4a563dc58d58290dddf3a68 portage-2.1.2_pre2-r4.patch.bz2 8550
+SHA256 85e0074ac5f5c015fb0b5f8c40140b76fdceaa903e6961d7ff0df6dd23d6cde7 portage-2.1.2_pre2-r4.patch.bz2 8550
+MD5 5b419eec00e4534c412ac7e9ac92760b portage-2.1.2_pre2.tar.bz2 302712
+RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 portage-2.1.2_pre2.tar.bz2 302712
+SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3 portage-2.1.2_pre2.tar.bz2 302712
+MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076
+RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076
+SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076
+MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
+RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
+SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425
diff --git a/sys-apps/portage/portage-2.1.2_pre2-r4.ebuild b/sys-apps/portage/portage-2.1.2_pre2-r4.ebuild
new file mode 100644
index 000000000000..87c4d5a30d5d
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.2_pre2-r4.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2_pre2-r4.ebuild,v 1.1 2006/10/05 23:16:22 zmedico Exp $
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+PROVIDE="virtual/portage"
+SLOT="0"
+# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
+IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
+IUSE_USERLAND="userland_Darwin userland_GNU"
+IUSE="build doc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
+DEPEND=">=dev-lang/python-2.3
+ !build? ( >=sys-apps/sed-4.0.5 )"
+RDEPEND=">=dev-lang/python-2.3
+ !build? ( >=sys-apps/sed-4.0.5
+ dev-python/python-fchksum
+ !userland_Darwin? ( >=app-shells/bash-3.0 ) )
+ elibc_glibc? ( sys-apps/sandbox )
+ elibc_uclibc? ( sys-apps/sandbox )
+ !userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
+ selinux? ( >=dev-python/python-selinux-2.16 )
+ doc? ( app-portage/portage-manpages )
+ >=dev-python/pycrypto-2.0.1-r5"
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+PV_PL="2.1"
+PATCHVER_PL="-r1"
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
+ ${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
+ linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+ ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
+
+PATCHVER=""
+[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
+if [ -n "${PATCHVER}" ]; then
+ SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
+ ${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
+fi
+
+if [ -n "${PATCHVER_PL}" ]; then
+ SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
+ ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
+fi
+
+S="${WORKDIR}"/${PN}-${PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+portage_docs() {
+ elog ""
+ elog "For help with using portage please consult the Gentoo Handbook"
+ elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+ elog ""
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ if [ -n "${PATCHVER}" ]; then
+ cd "${S}"
+ epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
+ fi
+ if [ "${PR}" != "r0" ]; then
+ elog "Setting portage.VERSION to ${PVR} ..."
+ sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+ die "Failed to patch portage.VERSION"
+ eend 0
+ fi
+ if [ -n "${PATCHVER_PL}" ]; then
+ use linguas_pl && \
+ epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
+ fi
+}
+
+src_compile() {
+ append-lfs-flags
+
+ cd "${S}"/src
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
+ die "Failed to build tbz2tool"
+
+ if use elibc_FreeBSD; then
+ cd "${S}"/src/bsd-flags
+ chmod +x setup.py
+ ./setup.py build || die "Failed to install bsd-chflags module"
+ fi
+}
+
+src_install() {
+ local portage_base="/usr/lib/portage"
+ cd "${S}"/cnf
+ insinto /etc
+ doins etc-update.conf dispatch-conf.conf make.globals
+ if [ -f "make.conf.${ARCH}".diff ]; then
+ patch make.conf "make.conf.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ newins make.conf make.conf.example
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ newins make.conf make.conf.example
+ fi
+
+ if use elibc_FreeBSD; then
+ cd "${S}"/src/bsd-flags
+ ./setup.py install --root "${D}" || \
+ die "Failed to install bsd-chflags module"
+ fi
+
+ dodir ${portage_base}/bin
+ exeinto ${portage_base}/bin
+ # BSD and OSX need a sed wrapper so that find/xargs work properly
+ if use userland_GNU; then
+ rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
+ fi
+ cd "${S}"/bin
+ doexe *
+ doexe "${S}"/src/tbz2tool
+ dosym newins ${portage_base}/bin/donewins
+
+ for mydir in pym pym/cache pym/elog_modules; do
+ dodir ${portage_base}/${mydir}
+ insinto ${portage_base}/${mydir}
+ cd "${S}"/${mydir}
+ doins *.py
+ done
+
+ doman "${S}"/man/*.[0-9]
+ if use linguas_pl; then
+ doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
+ doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
+ fi
+ dodoc "${S}"/ChangeLog
+ dodoc "${S}"/NEWS
+ dodoc "${S}"/RELEASE-NOTES
+
+ dodir /usr/bin
+ for x in ebuild emerge portageq repoman tbz2tool xpak; do
+ dosym ../lib/portage/bin/${x} /usr/bin/${x}
+ done
+
+ dodir /usr/sbin
+ local my_syms="archive-conf
+ dispatch-conf
+ emaint
+ emerge-webrsync
+ env-update
+ etc-update
+ fixpackages
+ quickpkg
+ regenworld"
+ local x
+ for x in ${my_syms}; do
+ dosym ../lib/portage/bin/${x} /usr/sbin/${x}
+ done
+
+ dodir /etc/portage
+ keepdir /etc/portage
+
+ doenvd "${FILESDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+ local portage_base="/usr/lib/portage"
+ if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+ rm -rf "${IMAGE}"/${portage_base}/pym/*
+ mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
+ rm -rf "${IMAGE}"/${portage_base}/bin/*
+ mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
+ else
+ for mydir in pym pym/cache pym/elog_modules; do
+ rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
+ rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
+ done
+ fi
+}
+
+pkg_postinst() {
+ local x
+
+ if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
+ [ -f "${ROOT}"/var/cache/edb/world ] &&
+ [ ! -h "${ROOT}"/var/cache/edb/world ]; then
+ mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
+ ln -s ../../lib/portage/world /var/cache/edb/world
+ fi
+
+ for x in "${ROOT}"/etc/._cfg????_make.globals; do
+ # Overwrite the globals file automatically.
+ [ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
+ done
+
+ ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time"
+ ewarn "dependencies that are not strictly required. This behavior is adjustable"
+ ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
+ ewarn "For more information regarding this change, please refer to bug #148870."
+
+ portage_docs
+}