diff options
| -rw-r--r-- | sys-apps/portage/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 22 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.1.2_pre1-r1 | 12 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.2_pre1-r1.ebuild | 200 |
4 files changed, 234 insertions, 8 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index b2683c5ee76e..451200bb2775 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # 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.249 2006/09/16 03:27:15 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.250 2006/09/23 02:20:23 zmedico Exp $ + +*portage-2.1.2_pre1-r1 (23 Sep 2006) + + 23 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_pre1-r1.ebuild: + 2.1.2_pre1-r1 revbump. This fixes bugs #16365, #79606, #145601, #147729, + #147766, #148115, and #148615. 16 Sep 2006; Zac Medico <zmedico@gentoo.org> -portage-2.0.54-r2.ebuild: Remove an old version. diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 59412a61332e..c45e6bb34a56 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -16,6 +16,7 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389 +DIST portage-2.1.2_pre1-r1.patch.bz2 12950 RMD160 0474040b06afa9d86d9d74d46c13c1dee0b82b99 SHA1 1810e54f8a97e8e5dce25c2eeffe57f08a4e0e1e SHA256 54c073e4aa17c024b21cfa4bca48dcb16007a950b90b3f6dbaa5579f607edc68 DIST portage-2.1.2_pre1.tar.bz2 298238 RMD160 9f962d49833b4ce09880b6b6691c7b6566722509 SHA1 3df44514039c57477c2ad7c8a3888d4a365e6a9a SHA256 498e91d732e09164cede316d7747558ea3e1b60997268dd573f344b8e6d51119 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 @@ -31,14 +32,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_pre1-r1.ebuild 5807 RMD160 fc6ef761d3e64847eef55920fb847fb2d3c425fc SHA1 892c43cb37a08158a9ab59d2e53f7dec404885e4 SHA256 10216d99c592218a597475db8dd2350e2a8bb808e6233d7ac4f13a65a5da4c27 +MD5 98c125fe38546c43218609df8997aa0c portage-2.1.2_pre1-r1.ebuild 5807 +RMD160 fc6ef761d3e64847eef55920fb847fb2d3c425fc portage-2.1.2_pre1-r1.ebuild 5807 +SHA256 10216d99c592218a597475db8dd2350e2a8bb808e6233d7ac4f13a65a5da4c27 portage-2.1.2_pre1-r1.ebuild 5807 EBUILD portage-2.1.2_pre1.ebuild 5804 RMD160 58e96e6a397c8241108d9154a718a8dcec9b9f85 SHA1 de8389b509c4284885a0d304ab2002b8718c3f51 SHA256 29887f1bbca2272028fb7d02b12c6201a071d7f4aad16ea6c91618eb5ae3ddcd MD5 0566444ee16a1f69b17e093b31727809 portage-2.1.2_pre1.ebuild 5804 RMD160 58e96e6a397c8241108d9154a718a8dcec9b9f85 portage-2.1.2_pre1.ebuild 5804 SHA256 29887f1bbca2272028fb7d02b12c6201a071d7f4aad16ea6c91618eb5ae3ddcd portage-2.1.2_pre1.ebuild 5804 -MISC ChangeLog 12988 RMD160 43ebdaed6a2fd8d6ad40d7da7c522b1c9ba41fa9 SHA1 4d13f26cdadee3407b989747452b55cc1f3df705 SHA256 4ee95f297d543fdeabb1c915be25149fc6af1c8e5b5cba4fb6e8d98c8caccd70 -MD5 1744cd0b4f51ba1b8d58903ce8585e63 ChangeLog 12988 -RMD160 43ebdaed6a2fd8d6ad40d7da7c522b1c9ba41fa9 ChangeLog 12988 -SHA256 4ee95f297d543fdeabb1c915be25149fc6af1c8e5b5cba4fb6e8d98c8caccd70 ChangeLog 12988 +MISC ChangeLog 13213 RMD160 631870b83b16037450ac4a9bb9cd163f5c1514ae SHA1 99db9812822ad8e0f74329189633925ed54b9e21 SHA256 d26d919b215c0f3c0b74325f0d10e8a392bd894a83075d06ea971c1c24b928d1 +MD5 d9945304b28e4921f008f42dc7274d0a ChangeLog 13213 +RMD160 631870b83b16037450ac4a9bb9cd163f5c1514ae ChangeLog 13213 +SHA256 d26d919b215c0f3c0b74325f0d10e8a392bd894a83075d06ea971c1c24b928d1 ChangeLog 13213 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219 @@ -55,10 +60,13 @@ SHA256 54848742dff9ea07bf01d3fc8988a31a868faf590b33982ef6f3f81f87c97e0c files/di MD5 7aee70b0ab92ae835a879aa600237d1a files/digest-portage-2.1.2_pre1 783 RMD160 28b0e6852c6069e63cb8e5bfafcc4abba7de459d files/digest-portage-2.1.2_pre1 783 SHA256 cc9ebce98fefa560f5f7e5c94d28e463e3207815ef8b46c9a78b2b33bb09d6a4 files/digest-portage-2.1.2_pre1 783 +MD5 7b00eaae09038c453228e994d2d76260 files/digest-portage-2.1.2_pre1-r1 1054 +RMD160 f1b2672a9783c019e035601701240bd1d1cba0f8 files/digest-portage-2.1.2_pre1-r1 1054 +SHA256 d4dfcaf52685b662ca59cb0d82202e6524295cb3996fd9a75b08f430273c9827 files/digest-portage-2.1.2_pre1-r1 1054 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFC3Cs/ejvha5XGaMRAm/6AJ4j+04CYj1cjfYxXvCZMYilQlN5GACgp5wT -zECSs6tNVaZc6OduJP5iBs0= -=hu3n +iD8DBQFFFJmJ/ejvha5XGaMRAiPGAKDZdeQAIlsXEQAv27O1fJRV68OwBwCgmdef +kt4vJfeArnQ6XEKDgLiHQIc= +=nAlC -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre1-r1 b/sys-apps/portage/files/digest-portage-2.1.2_pre1-r1 new file mode 100644 index 000000000000..d5e348f3839b --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2_pre1-r1 @@ -0,0 +1,12 @@ +MD5 5e6e4acfbcb60d865031c61b32a596a0 portage-2.1.2_pre1-r1.patch.bz2 12950 +RMD160 0474040b06afa9d86d9d74d46c13c1dee0b82b99 portage-2.1.2_pre1-r1.patch.bz2 12950 +SHA256 54c073e4aa17c024b21cfa4bca48dcb16007a950b90b3f6dbaa5579f607edc68 portage-2.1.2_pre1-r1.patch.bz2 12950 +MD5 6b545a8fc30d0de1f83a091994418d38 portage-2.1.2_pre1.tar.bz2 298238 +RMD160 9f962d49833b4ce09880b6b6691c7b6566722509 portage-2.1.2_pre1.tar.bz2 298238 +SHA256 498e91d732e09164cede316d7747558ea3e1b60997268dd573f344b8e6d51119 portage-2.1.2_pre1.tar.bz2 298238 +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_pre1-r1.ebuild b/sys-apps/portage/portage-2.1.2_pre1-r1.ebuild new file mode 100644 index 000000000000..41e5c005a4b6 --- /dev/null +++ b/sys-apps/portage/portage-2.1.2_pre1-r1.ebuild @@ -0,0 +1,200 @@ +# 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_pre1-r1.ebuild,v 1.1 2006/09/23 02:20:23 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 + + portage_docs +} |