From 0343609e61547da2e9bed02582704aa14ecbec29 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 28 Jul 2007 06:12:47 +0000 Subject: 2.1.3 release Package-Manager: portage-2.1.3 --- sys-apps/portage/ChangeLog | 8 +- sys-apps/portage/Manifest | 30 +-- sys-apps/portage/files/digest-portage-2.1.3 | 6 + sys-apps/portage/files/digest-portage-2.1.3_rc8 | 9 - sys-apps/portage/portage-2.1.3.ebuild | 244 ++++++++++++++++++++++++ sys-apps/portage/portage-2.1.3_rc8.ebuild | 244 ------------------------ 6 files changed, 272 insertions(+), 269 deletions(-) create mode 100644 sys-apps/portage/files/digest-portage-2.1.3 delete mode 100644 sys-apps/portage/files/digest-portage-2.1.3_rc8 create mode 100644 sys-apps/portage/portage-2.1.3.ebuild delete mode 100644 sys-apps/portage/portage-2.1.3_rc8.ebuild (limited to 'sys-apps') diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index e5c23bf461b7..3e46b8436209 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.408 2007/07/22 22:38:54 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.409 2007/07/28 06:12:47 zmedico Exp $ + +*portage-2.1.3 (28 Jul 2007) + + 28 Jul 2007; Zac Medico +portage-2.1.3.ebuild: + 2.1.3 release. This fixes bugs #185048, #186337, #186480, #186639, + and #186826. Bug #181949 tracks all bugs fixed since 2.1.2.x. *portage-2.1.3_rc9 (22 Jul 2007) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index a5668b833798..c3a6a0ace840 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -20,7 +20,7 @@ DIST portage-2.1.2.2.patch.bz2 36946 RMD160 cb55d2d2aa68ee149c8f6d9d94dfa3be5a88 DIST portage-2.1.2.7.patch.bz2 52460 RMD160 c6e963d38a1bb5e174b6f2cd8c4e47bac2bef4bf SHA1 817b1d9dd119a90c8e3d8375d996f194215a9be1 SHA256 477aefd64234b77181ef04d3d7617bb86b26739022ffd8108f8aadc2c5f5b084 DIST portage-2.1.2.9.patch.bz2 61579 RMD160 ba315f393f8ecf4a89811c650131f3ad51b754d9 SHA1 0dfdc95e9becd0475e417f93417edfd8c0ab4fbb SHA256 4de01cc201f60438a1973aef146c4bbc715bc271fac0717e960c1d5cef8205a4 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 -DIST portage-2.1.3_rc8.patch.bz2 128238 RMD160 b85e5f23c603f67e82fe81d1974e05f4bd4fa542 SHA1 2e13bd85b4aa6da4ae2dc15cc604e7bad4bc63d2 SHA256 fb654b19cb546eb37eb03bb7b9697d2ff318addd3ee29c43e04a5c612feffa58 +DIST portage-2.1.3.tar.bz2 356902 RMD160 064ec10181e3b7f6727810b83dbd1c1d2c9b0462 SHA1 946e9d09cfacaddfa9c3570e3599f763f75be2e4 SHA256 6f06dfebc7a626e88af6a7c99d4c1c380a6ae0ad4adede7cdf2510ba04c43883 DIST portage-2.1.3_rc9.patch.bz2 136937 RMD160 7198009db19d05adb571e64c1fd6bbaf1101f87d SHA1 c11ff897cfa2d3a0e8f435460e5e72bc8aaa6de7 SHA256 a77b492e7006c361840505c569b217a1a107ccc14ed79a0b0a81fc9d9bf410bb DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f @@ -45,18 +45,18 @@ EBUILD portage-2.1.2.9.ebuild 7160 RMD160 9e84120d079a59fef4a02bed632ffff4be4a80 MD5 cc5e4b13ce80d09b07e4178c94e14d50 portage-2.1.2.9.ebuild 7160 RMD160 9e84120d079a59fef4a02bed632ffff4be4a8016 portage-2.1.2.9.ebuild 7160 SHA256 085c461eae32f5279c6c44eac3b9158e5a340baf7dfa67e068fea6751ad4b664 portage-2.1.2.9.ebuild 7160 -EBUILD portage-2.1.3_rc8.ebuild 7319 RMD160 11cbbdf2f3accd12cf112ee6112c02cbe68407cd SHA1 dad5072d8db83643f03a1d661d599424fe088ae1 SHA256 edbe51d4cd487452637446d567b7bfbb240e6d6167ce56e668a70e0fd97ea993 -MD5 ea82ac92ae04adbe1828774b340f63ce portage-2.1.3_rc8.ebuild 7319 -RMD160 11cbbdf2f3accd12cf112ee6112c02cbe68407cd portage-2.1.3_rc8.ebuild 7319 -SHA256 edbe51d4cd487452637446d567b7bfbb240e6d6167ce56e668a70e0fd97ea993 portage-2.1.3_rc8.ebuild 7319 +EBUILD portage-2.1.3.ebuild 7307 RMD160 0d0548f9c0fe80cf11ae7a671db8dd84a77a24fe SHA1 eec9e91d4c0622be1e2e527e999575aa969e185c SHA256 09a7143f6ba4b4ade2f1d9342c1478a6862da02175bdd5a1e7f6ce290dba43d0 +MD5 0d7683a12507f293e17a5d50cf89750e portage-2.1.3.ebuild 7307 +RMD160 0d0548f9c0fe80cf11ae7a671db8dd84a77a24fe portage-2.1.3.ebuild 7307 +SHA256 09a7143f6ba4b4ade2f1d9342c1478a6862da02175bdd5a1e7f6ce290dba43d0 portage-2.1.3.ebuild 7307 EBUILD portage-2.1.3_rc9.ebuild 7319 RMD160 e0c8a5f62f4973b04eae9f0806d71da81c653672 SHA1 b3c503223d37c7edd5b02bb425819a7b48265c2b SHA256 604efd57de8f75e3aa6acf1a500c56728d5cd2125daed032011258355b254f4e MD5 ae63d9d0d0babc15901fc450a1c47096 portage-2.1.3_rc9.ebuild 7319 RMD160 e0c8a5f62f4973b04eae9f0806d71da81c653672 portage-2.1.3_rc9.ebuild 7319 SHA256 604efd57de8f75e3aa6acf1a500c56728d5cd2125daed032011258355b254f4e portage-2.1.3_rc9.ebuild 7319 -MISC ChangeLog 18468 RMD160 2a71d138dbe267bda131c0968689cd19cca0a6df SHA1 a04f9d483e727f1f40acd44a2757751e0e065073 SHA256 3bb73ee399de259335a13f84c2face35da31e1772a1c84c841f17b20db7f5c7e -MD5 97dcfc29ac8248eda1ce3684ddfaa696 ChangeLog 18468 -RMD160 2a71d138dbe267bda131c0968689cd19cca0a6df ChangeLog 18468 -SHA256 3bb73ee399de259335a13f84c2face35da31e1772a1c84c841f17b20db7f5c7e ChangeLog 18468 +MISC ChangeLog 18702 RMD160 868cf93edeb6feaac6efba16a2f2fd3950b8bb8e SHA1 a067703d67ae9c88b441d3af4aaca00163e5724c SHA256 cf824e6010f17ee2ad87be190bacf8d2f8a98d01d25188ec817cde48f3ba4973 +MD5 362da41726ec9f79f6a82d240a8b40e3 ChangeLog 18702 +RMD160 868cf93edeb6feaac6efba16a2f2fd3950b8bb8e ChangeLog 18702 +SHA256 cf824e6010f17ee2ad87be190bacf8d2f8a98d01d25188ec817cde48f3ba4973 ChangeLog 18702 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282 @@ -76,16 +76,16 @@ SHA256 a462f9a2c0c9d3d5cb8fe9cbcc25bf7c548af0aa481ecd4ac75baa263de136f1 files/di MD5 9ddf2195951bb996621c49dcadc737cb files/digest-portage-2.1.2.9 759 RMD160 02e8f49fa6522d49ea28c98da7cd211e5f633d16 files/digest-portage-2.1.2.9 759 SHA256 930cabb025bc5f9e963cc4f044688bbffb1cbc1e46c4b715ff2314d1469de01c files/digest-portage-2.1.2.9 759 -MD5 48d02f850feefb90f8f11e032d86c605 files/digest-portage-2.1.3_rc8 768 -RMD160 a484a04de12cce5846cb110b7f8a9846fb432fda files/digest-portage-2.1.3_rc8 768 -SHA256 1da71d79e92e5a40111a84fc25cc590fa577d4f7a99cdd28dd3bffdf3526d607 files/digest-portage-2.1.3_rc8 768 +MD5 efbf743603b736d7a8e1c28c8fe9fa55 files/digest-portage-2.1.3 506 +RMD160 5392f1b08166018b191c39e0e1eceff5f5da08a9 files/digest-portage-2.1.3 506 +SHA256 4bc65aadf3bfafea702aef122bc1951a33ad1bb31b8aad3f6ad9dabbebe616e0 files/digest-portage-2.1.3 506 MD5 75e82a4f4fe2e4a3155ba715f27d77fa files/digest-portage-2.1.3_rc9 768 RMD160 0e0146369ae928ef84c24f00eb793d06923cc3a3 files/digest-portage-2.1.3_rc9 768 SHA256 49f1c6e9b6ffa4490bc994c508d45cb99f2ac35dbc4103490966147c66f60a42 files/digest-portage-2.1.3_rc9 768 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.5 (GNU/Linux) -iD8DBQFGpBkmp/wUKkr7RBoRAszYAJ0TIWzJcfz5Z1ofcz4dD0yRzzQkeACffHyU -Al7uAoIfszgesr5bJGP4fq0= -=kWL5 +iD8DBQFGqt5j/ejvha5XGaMRAmMFAKDfvgsvxwgs0Uir9CjdSGlL3LkkGgCg3/Vc +iC0ohwanlPyaiXSUZa9NV7s= +=BHZ3 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.3 b/sys-apps/portage/files/digest-portage-2.1.3 new file mode 100644 index 000000000000..417e86d9644d --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.3 @@ -0,0 +1,6 @@ +MD5 c8b48f9de6763a020dd9a44c695668a3 portage-2.1.3.tar.bz2 356902 +RMD160 064ec10181e3b7f6727810b83dbd1c1d2c9b0462 portage-2.1.3.tar.bz2 356902 +SHA256 6f06dfebc7a626e88af6a7c99d4c1c380a6ae0ad4adede7cdf2510ba04c43883 portage-2.1.3.tar.bz2 356902 +MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893 +RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893 +SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893 diff --git a/sys-apps/portage/files/digest-portage-2.1.3_rc8 b/sys-apps/portage/files/digest-portage-2.1.3_rc8 deleted file mode 100644 index d35b11915095..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.3_rc8 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900 -RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900 -SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900 -MD5 1b55e51bab5583cd63ef5a4a9b96d366 portage-2.1.3_rc8.patch.bz2 128238 -RMD160 b85e5f23c603f67e82fe81d1974e05f4bd4fa542 portage-2.1.3_rc8.patch.bz2 128238 -SHA256 fb654b19cb546eb37eb03bb7b9697d2ff318addd3ee29c43e04a5c612feffa58 portage-2.1.3_rc8.patch.bz2 128238 -MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893 -RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893 -SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893 diff --git a/sys-apps/portage/portage-2.1.3.ebuild b/sys-apps/portage/portage-2.1.3.ebuild new file mode 100644 index 000000000000..a9492596aa7c --- /dev/null +++ b/sys-apps/portage/portage-2.1.3.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3.ebuild,v 1.1 2007/07/28 06:12:47 zmedico Exp $ + +inherit toolchain-funcs eutils flag-o-matic multilib + +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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~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="build doc epydoc selinux linguas_pl userland_GNU ${IUSE_ELIBC}" +DEPEND=">=dev-lang/python-2.4 + !build? ( >=sys-apps/sed-4.0.5 ) + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0 )" +RDEPEND=">=dev-lang/python-2.4 + !build? ( >=sys-apps/sed-4.0.5 + dev-python/python-fchksum + >=app-shells/bash-3.0 ) + elibc_FreeBSD? ( dev-python/py-freebsd ) + elibc_glibc? ( >=sys-apps/sandbox-1.2.17 ) + elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 ) + >=app-misc/pax-utils-0.1.13 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + selinux? ( >=dev-python/python-selinux-2.16 ) + doc? ( app-portage/portage-manpages ) + >=dev-python/pycrypto-2.0.1-r5 + >=net-misc/rsync-2.6.4" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# rsync-2.6.4 rdep is for the --filter option #167668 +SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" + +PV_PL="2.1.2" +PATCHVER_PL="" +TARBALL_PV=${PV} +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + ${SRC_ARCHIVES}/${PN}-${TARBALL_PV}.tar.bz2 + linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 + ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )" + +PATCHVER="" +if [ -n "${PATCHVER}" ]; then + SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 + ${SRC_ARCHIVES}/${PN}-${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}-${TARBALL_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}-${PATCHVER}.patch" + fi + einfo "Setting portage.VERSION to ${PVR} ..." + sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ + die "Failed to patch portage.VERSION" + eend 0 + 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 doc; then + cd "${S}"/doc + touch fragment/date + sed -i "s/svn-trunk/${PVR}/" fragment/version + make xhtml-nochunks || die "failed to make docs" + fi + + if use epydoc; then + einfo "Generating api docs" + mkdir "${WORKDIR}"/api + local my_modules + my_modules="$(find "${S}/pym" -name "*.py" \ + | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ + -e 's:/:.:g')" || die "error listing modules" + PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ + -qqqqq --ignore-param-mismatch --no-frames --show-imports \ + --name "${PN}" --url "${HOMEPAGE}" \ + ${my_modules} || die "epydoc failed" + fi +} + +src_test() { + ./tests/runTests || \ + die "test(s) failed" +} + +src_install() { + local libdir=$(get_libdir) + local portage_base="/usr/${libdir}/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 + + insinto /etc/logrotate.d + doins "${S}"/cnf/logrotate.d/elog-save-summary + + 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 + use doc && dohtml "${S}"/doc/*.html + use epydoc && dohtml -r "${WORKDIR}"/api + + dodir /usr/bin + for x in ebuild emerge portageq repoman tbz2tool xpak; do + dosym ../${libdir}/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 ../${libdir}/portage/bin/${x} /usr/sbin/${x} + done + dosym env-update /usr/sbin/update-env + dosym etc-update /usr/sbin/update-etc + + dodir /etc/portage + keepdir /etc/portage + + echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd + doenvd "${WORKDIR}"/05portage.envd +} + +pkg_preinst() { + local portage_base="/usr/$(get_libdir)/portage" + if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then + rm -rf "${D}"/${portage_base}/pym/* + mv "${D}"/${portage_base}/bin/tbz2tool "${T}" + rm -rf "${D}"/${portage_base}/bin/* + mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/ + fi + remove_python_bytecodes +} + +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 + + elog + elog "The world file now supports slot atoms such as 'sys-devel/gcc:3.4'. In some" + elog "cases, emerge --depclean may remove slots that it would not have removed" + elog "in the past. The emerge --noreplace command can be used to add an atom to" + elog "the world file and prevent matching packages from being removed. A slot" + elog "atom will be recorded in the world file for any atom that is precise enough" + elog "to identify a specific slot." + + portage_docs +} + +pkg_postrm() { + remove_python_bytecodes +} + +remove_python_bytecodes() { + local d="${ROOT}/usr/$(get_libdir)/portage/pym" + [ -d "${d}" ] || return + find "${d}" -type d -print0 | \ + while read -d $'\0' d ; do + cd "${d}" + rm -f *.pyc *.pyo + done +} diff --git a/sys-apps/portage/portage-2.1.3_rc8.ebuild b/sys-apps/portage/portage-2.1.3_rc8.ebuild deleted file mode 100644 index c4333779a237..000000000000 --- a/sys-apps/portage/portage-2.1.3_rc8.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3_rc8.ebuild,v 1.1 2007/07/11 20:26:58 zmedico Exp $ - -inherit toolchain-funcs eutils flag-o-matic multilib - -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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~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="build doc epydoc selinux linguas_pl userland_GNU ${IUSE_ELIBC}" -DEPEND=">=dev-lang/python-2.4 - !build? ( >=sys-apps/sed-4.0.5 ) - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0 )" -RDEPEND=">=dev-lang/python-2.4 - !build? ( >=sys-apps/sed-4.0.5 - dev-python/python-fchksum - >=app-shells/bash-3.0 ) - elibc_FreeBSD? ( dev-python/py-freebsd ) - elibc_glibc? ( >=sys-apps/sandbox-1.2.17 ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 ) - >=app-misc/pax-utils-0.1.13 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - selinux? ( >=dev-python/python-selinux-2.16 ) - doc? ( app-portage/portage-manpages ) - >=dev-python/pycrypto-2.0.1-r5 - >=net-misc/rsync-2.6.4" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# rsync-2.6.4 rdep is for the --filter option #167668 -SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" - -PV_PL="2.1.2" -PATCHVER_PL="" -TARBALL_PV="2.1.2" -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - ${SRC_ARCHIVES}/${PN}-${TARBALL_PV}.tar.bz2 - linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 - ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )" - -PATCHVER="${PVR}" -if [ -n "${PATCHVER}" ]; then - SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 - ${SRC_ARCHIVES}/${PN}-${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}-${TARBALL_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}-${PATCHVER}.patch" - fi - einfo "Setting portage.VERSION to ${PVR} ..." - sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ - die "Failed to patch portage.VERSION" - eend 0 - 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 doc; then - cd "${S}"/doc - touch fragment/date - sed -i "s/svn-trunk/${PVR}/" fragment/version - make xhtml-nochunks || die "failed to make docs" - fi - - if use epydoc; then - einfo "Generating api docs" - mkdir "${WORKDIR}"/api - local my_modules - my_modules="$(find "${S}/pym" -name "*.py" \ - | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ - -e 's:/:.:g')" || die "error listing modules" - PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --ignore-param-mismatch --no-frames --show-imports \ - --name "${PN}" --url "${HOMEPAGE}" \ - ${my_modules} || die "epydoc failed" - fi -} - -src_test() { - ./tests/runTests || \ - die "test(s) failed" -} - -src_install() { - local libdir=$(get_libdir) - local portage_base="/usr/${libdir}/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 - - insinto /etc/logrotate.d - doins "${S}"/cnf/logrotate.d/elog-save-summary - - 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 - use doc && dohtml "${S}"/doc/*.html - use epydoc && dohtml -r "${WORKDIR}"/api - - dodir /usr/bin - for x in ebuild emerge portageq repoman tbz2tool xpak; do - dosym ../${libdir}/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 ../${libdir}/portage/bin/${x} /usr/sbin/${x} - done - dosym env-update /usr/sbin/update-env - dosym etc-update /usr/sbin/update-etc - - dodir /etc/portage - keepdir /etc/portage - - echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd - doenvd "${WORKDIR}"/05portage.envd -} - -pkg_preinst() { - local portage_base="/usr/$(get_libdir)/portage" - if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then - rm -rf "${D}"/${portage_base}/pym/* - mv "${D}"/${portage_base}/bin/tbz2tool "${T}" - rm -rf "${D}"/${portage_base}/bin/* - mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/ - fi - remove_python_bytecodes -} - -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 - - elog - elog "The world file now supports slot atoms such as 'sys-devel/gcc:3.4'. In some" - elog "cases, emerge --depclean may remove slots that it would not have removed" - elog "in the past. The emerge --noreplace command can be used to add an atom to" - elog "the world file and prevent matching packages from being removed. A slot" - elog "atom will be recorded in the world file for any atom that is precise enough" - elog "to identify a specific slot." - - portage_docs -} - -pkg_postrm() { - remove_python_bytecodes -} - -remove_python_bytecodes() { - local d="${ROOT}/usr/$(get_libdir)/portage/pym" - [ -d "${d}" ] || return - find "${d}" -type d -print0 | \ - while read -d $'\0' d ; do - cd "${d}" - rm -f *.pyc *.pyo - done -} -- cgit v1.2.3-65-gdbad