diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 22 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.6.11.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.6.12.ebuild | 306 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.6.13.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2_rc28.ebuild | 323 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2_rc31.ebuild | 336 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2_rc32.ebuild | 342 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2_rc33.ebuild | 5 |
9 files changed, 23 insertions, 1332 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 1219b7ed5ae0..358f4483b57d 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.606 2009/06/03 02:51:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.607 2009/06/03 18:39:24 zmedico Exp $ + + 03 Jun 2009; Zac Medico <zmedico@gentoo.org> portage-2.1.6.11.ebuild, + portage-2.1.6.13.ebuild, portage-2.2_rc33.ebuild: + Bug #271545 - Bump python dependency from 2.4 to 2.5. + + 03 Jun 2009; Zac Medico <zmedico@gentoo.org> -portage-2.1.6.12.ebuild, + -portage-2.2_rc28.ebuild, -portage-2.2_rc31.ebuild, + -portage-2.2_rc32.ebuild: + Remove old versions. 03 Jun 2009; Mike Frysinger <vapier@gentoo.org> portage-2.2_rc33.ebuild: Require newer sandbox #258684. diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index f1c61fe9a9ab..14a0cb22181b 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -5,33 +5,25 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f DIST portage-2.1.4.5.patch.bz2 16533 RMD160 d30009495e498452892f804926cb9e068f465f4c SHA1 471a3bc9a1dee021885aff900c52a98fa7ce6009 SHA256 9833b804a4443f9a92a4323505c5546e2b5341569b6dd2825c9269c6d6e6b615 DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f28579179 SHA1 eedc99e9de390fddadcc2df77e8f9ed67e607e2b SHA256 a10b4b9f9855bc2b340b6d9080d8d423cd3249bfad34aaf0c52b4b70f798ae11 DIST portage-2.1.6.11.patch.bz2 140468 RMD160 3bc3f1b562bdadcf141da730d9d3c1f2833d15fa SHA1 d5d82a172fff3d7adcc9a4e248f07b08420f82f4 SHA256 6bf32388dae5df18c5e4d84afee865ac72cfd1cec0944efe4b9909189249504a -DIST portage-2.1.6.12.patch.bz2 176773 RMD160 ec2a3246fdb4e582daa4ded24d5a9e392ceef879 SHA1 899a89264acec708ae094164fdb24005ae9da2a1 SHA256 8c0b2b90ea31765a7bcd75a565e32824ab9b87e4d1842dc9e9643916d350cef6 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c DIST portage-2.1.6.4.patch.bz2 26289 RMD160 2ce9fcfae8caa8ff7c2b789e6dcdd57862392646 SHA1 2d2a3b8dee8f85305158514b64e3a99d5e9eaa90 SHA256 88345d2334e63c16d35de13f0cb806c23a6f37868f448adde592bbe494b36827 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 DIST portage-2.2_rc15.tar.bz2 685597 RMD160 ad814885c5c6b31899fd4cd7d5866d19132bbd9b SHA1 3b562f0a4157f2cc1cf492f46560e2600ec0681f SHA256 fc381120f77338d33d2e53eb2892eebae0b772233d05cf8a2443700d3d6754f6 -DIST portage-2.2_rc28.patch.bz2 161536 RMD160 2e53c8a7b4140814b63f78677bc58e0641c5950c SHA1 3882d7f2a7ff4f90b17faf317bd45b5611e3f7a9 SHA256 e5603c711df09c543e07ec3b711badab198b03b94dd58e156f28b9ea72100e81 -DIST portage-2.2_rc31.patch.bz2 191240 RMD160 2a23d625fee681f75f6c0dfd005ad8153cdc18ab SHA1 14848030d471613442dd62ffe8617a43f98e0264 SHA256 eb6fe2e3ca3e09f86da12b8f9e401d2963bc703cd3fd57532eee40824ea9576f -DIST portage-2.2_rc32.patch.bz2 199794 RMD160 2f28373257430d6d3932bbd0bf1c7cf0fd7c0408 SHA1 683d37b51e20e4b06460942c07bc7b358495d2d2 SHA256 b0c5c94058e15ae043ddcac91ddc8fcc7c04693db48ac2dc22ad8ee6894c1bd4 DIST portage-2.2_rc33.patch.bz2 200577 RMD160 48d46b6d103009087f0d296d9a428eb3e8059d7b SHA1 9a47ec278362741f2d12c030dc395f4323a974ad SHA256 b8e69329c6cc7b4516f5ed74efa648d1fb8392b644239f5bb4f7cec7a0cdd76e DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f EBUILD portage-2.1.4.5.ebuild 8038 RMD160 bbe69fdad5ee1226bccb1ccfdcf2d6cf6fb07f36 SHA1 d1177651b3af538eeda9de938ef791d584dbf197 SHA256 0277f7ee9197b4bb8747a7381f9b7ce8809b09aebcc30b7832b284a72ea4cd3c -EBUILD portage-2.1.6.11.ebuild 9431 RMD160 7d2a251c089f2e5401de6312e677bbacb3a185b2 SHA1 38647d607484bf34d154f5c43c8792c08e2ce719 SHA256 660ccce70e531be81a7e49317543c495c7b6cee827f5c37e7662b7ad7e6e59d7 -EBUILD portage-2.1.6.12.ebuild 9913 RMD160 2004f86bbda6a07f5fe112363f7a98000d061a7f SHA1 a0af1c2e4e6f6da918298459d6e3f35e89f1b1ef SHA256 0bf41c457874006938aa7aa0c8b852fd43a8759ba56ecdd19144a8d0f989202b -EBUILD portage-2.1.6.13.ebuild 9913 RMD160 eb3c1a7faa2d00f50510fd827c0cc722d139b434 SHA1 23cbe7a522a1c92b0e3f9137dfc1e05e1dfb0a05 SHA256 f52d38e4e4f94e3c8e5b156dcb3923670dcd304897d2fe383019e373f180fa94 +EBUILD portage-2.1.6.11.ebuild 9370 RMD160 aee4db3f3e6d08efcdb477339c372c52711f6847 SHA1 016d999ae7c91341231c125d031331e78fc5ec8f SHA256 dfb77d0fdf12194b0e2aad84536d099299eefa63491b28981825b9e1a5066fd7 +EBUILD portage-2.1.6.13.ebuild 9851 RMD160 8ec10dd8f3d55ba61b934ff15d148916efb3cfa7 SHA1 5b4a24a4db4e951cd6c113ebb89c9b6182759864 SHA256 7c8ac2749257337e67391d6f94a85e7d1e20644dee3a59edcef9fbbbd92f8609 EBUILD portage-2.1.6.4.ebuild 8693 RMD160 84a9ec67abf0b8f7892eb566a543d8bace773085 SHA1 5056f1e98fa82035c5bf47f65a3b88984fcce019 SHA256 96a8b60694a41fe1f3bd462cdc1a16d2d8155c56155b32aa2ce6b57646b00b01 EBUILD portage-2.1.6.7.ebuild 8692 RMD160 88dc8f5e801b552419eb29671c7c999f45985eca SHA1 31372fdee62ec12ed997eb7e190cda8a0909860a SHA256 06b6f47e3534071f19cb9be7c24a4a9d81f07397312fdc14ff886df37f37e245 -EBUILD portage-2.2_rc28.ebuild 9933 RMD160 90b3d818c67bc787229272b209ce4e4a480e5e98 SHA1 728cde592ce5b528e128a9ff444d89c02b97516f SHA256 1d640f072a9649284de8a35f9e31c7b6467c84b9b424785bcc01f0872e7c5c65 -EBUILD portage-2.2_rc31.ebuild 10370 RMD160 359a491e6a3fa8fa5562bee320423f5771092b13 SHA1 539ee939a2eb9bc319154dc06a89f769f863be7c SHA256 d398707576ad938210067dbb35385ee7a5a06a1bd86e20d61420cde5f3bbe96d -EBUILD portage-2.2_rc32.ebuild 10589 RMD160 1877002262eb0544f9a288f18fc48ea4adb30292 SHA1 6803263caeb45689a43ac0f0a76da82ce8ea9443 SHA256 50c5e44461fb6018db8a458d5bf1d4a116309fc34b38677840b9c8d5a195f223 -EBUILD portage-2.2_rc33.ebuild 10498 RMD160 debe4100521b92a5b60765b3681e457aec1fbc29 SHA1 e06ac1bad646bcbd4d4ae0376afe2d8ef38f2729 SHA256 d043c46cbde92086390e005f1a99570f716439623c36982e5e20775efa0ef859 -MISC ChangeLog 32958 RMD160 cf547309df6f791173791f89c946ee3ed2f88f13 SHA1 c36394c9373d3209ef0451d317c97c45b50f5bc2 SHA256 29d8cd4ed41ff10c84cab00aa1c538867e3d07041ee4db9ffa1c9db6ca23f9ca +EBUILD portage-2.2_rc33.ebuild 10437 RMD160 7bcacd1d0de0fb95dfa408f3b75c475741e06b8d SHA1 0619c129d852be587407527ccfb1d114cd196191 SHA256 8602bffcd063b0ef8c33dc39e5376dcad2f2a75a6c89b1ddf3fc5b9943e8848b +MISC ChangeLog 33319 RMD160 e3d3489d33c955e02c2a5c23bc4d29f1f2476063 SHA1 e635dd0143d3864a5472217984b95b3e5c43046b SHA256 c449bc57f4bdd4d690ccba0e23818186a38c934517ad2052c91967b7b8125cf1 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkol5VUACgkQn/5bYzqsSmERPACfd6ngo4hm5JOVUOXW9Qao9ICG -Q7AAn3t99i6LObuZYXrSc9ztddND2bud -=CvZ2 +iEYEARECAAYFAkomw4YACgkQ/ejvha5XGaM5UACfTtLvuBsew4Q2+VbZ3UTTGaJ3 +q2QAnRJUlbH3mFqCLafWB3LoRVmsSD6F +=/A2w -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.6.11.ebuild b/sys-apps/portage/portage-2.1.6.11.ebuild index 69fa29c0acb1..23b8da50782a 100644 --- a/sys-apps/portage/portage-2.1.6.11.ebuild +++ b/sys-apps/portage/portage-2.1.6.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.11.ebuild,v 1.6 2009/04/29 14:53:21 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.11.ebuild,v 1.7 2009/06/03 18:39:24 zmedico Exp $ inherit eutils multilib python @@ -12,7 +12,7 @@ PROVIDE="virtual/portage" SLOT="0" IUSE="build doc epydoc selinux linguas_pl" -python_dep=">=dev-lang/python-2.4" +python_dep=">=dev-lang/python-2.5" DEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 ) @@ -31,7 +31,6 @@ PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) - || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) )" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # rsync-2.6.4 rdep is for the --filter option #167668 diff --git a/sys-apps/portage/portage-2.1.6.12.ebuild b/sys-apps/portage/portage-2.1.6.12.ebuild deleted file mode 100644 index e7e35edd8493..000000000000 --- a/sys-apps/portage/portage-2.1.6.12.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.12.ebuild,v 1.1 2009/05/02 02:22:07 zmedico Exp $ - -inherit eutils multilib python - -DESCRIPTION="Portage is the 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" -IUSE="build doc epydoc selinux linguas_pl" - -python_dep=">=dev-lang/python-2.4" - -DEPEND="${python_dep} - !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="${python_dep} - !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 - >=app-admin/eselect-news-20071201 ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=dev-python/python-selinux-2.16 )" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) - )" -# 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" - -prefix_src_archives() { - local x y - for x in ${@}; do - for y in ${SRC_ARCHIVES}; do - echo ${y}/${x} - done - done -} - -PV_PL="2.1.2" -PATCHVER_PL="" -TARBALL_PV=2.1.6 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) - linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 - $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" - -PATCHVER=$PV -if [ -n "${PATCHVER}" ]; then - SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 - $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" -fi - -S="${WORKDIR}"/${PN}-${TARBALL_PV} -S_PL="${WORKDIR}"/${PN}-${PV_PL} - -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/__init__.py || \ - die "Failed to patch portage.VERSION" -} - -src_compile() { - - if use doc; then - cd "${S}"/doc - touch fragment/date - make xhtml xhtml-nochunks || die "failed to make docs" - fi - - if use epydoc; then - einfo "Generating api docs" - mkdir "${WORKDIR}"/api - local my_modules epydoc_opts="" - # A name collision between the portage.dbapi class and the - # module with the same name triggers an epydoc crash unless - # portage.dbapi is excluded from introspection. - ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \ - epydoc_opts='--exclude-introspect portage\.dbapi' - my_modules="$(find "${S}/pym" -name "*.py" \ - | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ - -e 's:/:.:g' | sort)" || die "error listing modules" - PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --no-frames --show-imports $epydoc_opts \ - --name "${PN}" --url "${HOMEPAGE}" \ - ${my_modules} || die "epydoc failed" - fi -} - -src_test() { - ./pym/portage/tests/runTests || \ - die "test(s) failed" -} - -src_install() { - local libdir=$(get_libdir) - local portage_base="/usr/${libdir}/portage" - local portage_share_config=/usr/share/portage/config - - cd "${S}"/cnf - insinto /etc - doins etc-update.conf dispatch-conf.conf - - dodir "${portage_share_config}" - insinto "${portage_share_config}" - doins "${S}/cnf/"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 - - dosym ..${portage_share_config}/make.globals /etc/make.globals - - 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/ebuild-helpers/sed || die "Failed to remove sed wrapper" - fi - - cd "${S}"/bin || die "cd failed" - doexe $(find . -maxdepth 1 -type f) || die "doexe failed" - - local symlinks - dodir ${portage_base}/bin/ebuild-helpers || die "dodir failed" - exeinto ${portage_base}/bin/ebuild-helpers || die "exeinto failed" - cd "${S}"/bin/ebuild-helpers || die "cd failed" - doexe $(find . -type f ! -type l) || die "doexe failed" - symlinks=$(find . -type l) - if [ -n "$symlinks" ] ; then - cp -P $symlinks "${D}${portage_base}/bin/ebuild-helpers/" || \ - die "cp failed" - fi - - # These symlinks will be included in the next tarball. - # Until then, create them manually. - dosym ../portageq ${portage_base}/bin/ebuild-helpers/portageq || \ - die "dosym failed" - local x - for x in eerror einfo ewarn eqawarn ; do - dosym elog ${portage_base}/bin/ebuild-helpers/$x || die "dosym failed" - done - - for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do - dodir ${portage_base}/${mydir} - insinto ${portage_base}/${mydir} - cd "${S}"/${mydir} - doins *.py - symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) - [ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}" - done - - # Symlinks to directories cause up/downgrade issues and the use of these - # modules outside of portage is probably negligible. - for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do - [ ! -L "${x}" ] && continue - die "symlink to directory will cause upgrade/downgrade issues: '${x}'" - done - - exeinto ${portage_base}/pym/portage/tests - doexe "${S}"/pym/portage/tests/runTests - - 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,NEWS,RELEASE-NOTES} - use doc && dohtml -r "${S}"/doc/* - use epydoc && dohtml -r "${WORKDIR}"/api - - dodir /usr/bin - for x in ebuild egencache emerge portageq repoman 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 -} - -pkg_preinst() { - if ! use build && ! has_version dev-python/pycrypto && \ - has_version '>=dev-lang/python-2.5' ; then - if ! built_with_use '>=dev-lang/python-2.5' ssl ; then - ewarn "If you are an ebuild developer and you plan to commit ebuilds" - ewarn "with this system then please install dev-python/pycrypto or" - ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order" - ewarn "to enable RMD160 hash support." - ewarn "See bug #198398 for more information." - fi - fi - if [ -f "${ROOT}/etc/make.globals" ]; then - rm "${ROOT}/etc/make.globals" - fi - has_version ">=${CATEGORY}/${PN}-2.2_pre" - DOWNGRADE_FROM_2_2=$? - has_version "<${CATEGORY}/${PN}-2.1.6_pre" - UPGRADE_FROM_2_1=$? - - [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" - REPO_LAYOUT_CONF_WARN=$? -} - -pkg_postinst() { - # Compile all source files recursively. Any orphans - # will be identified and removed in postrm. - python_mod_optimize /usr/$(get_libdir)/portage/pym - - einfo - einfo "For help with using portage please consult the Gentoo Handbook" - einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" - einfo - - local warning_shown=0 - if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then - ewarn - echo "If you want overlay eclasses to override eclasses from" \ - "other repos then see the portage(5) man page" \ - "for information about the new layout.conf and repos.conf" \ - "configuration files." \ - | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done - warning_shown=1 - fi - if [ $DOWNGRADE_FROM_2_2 = 0 ] ; then - ewarn - echo "Since you have downgraded from portage-2.2, do not forget to" \ - "use revdep-rebuild when appropriate, since the @preserved-rebuild" \ - "package set is only supported with portage-2.2." | fmt -w 70 | \ - while read -r ; do ewarn "$REPLY" ; done - warning_shown=1 - fi - if [ $UPGRADE_FROM_2_1 = 0 ] ; then - ewarn - echo "In portage-2.1.6, the default behavior has changed for" \ - "\`emerge world\` and \`emerge system\` commands. These commands" \ - "will reinstall all packages from the given set unless an option" \ - "such as --noreplace, --update, or --newuse is specified." \ - | fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done - ewarn - echo "File collision protection is now enabled by default via" \ - "make.globals with FEATURES=protect-owned. If you want to" \ - "disable collision protection completely (not recommended), then" \ - "you need to ensure that neither protect-owned nor collision-protect" \ - "are enabled." | fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done - ewarn - echo "If you have overridden FETCHCOMMAND or RESUMECOMMAND variables," \ - "for compatibility with EAPI 2, you must ensure that these variables" \ - "are written such that the downloaded file will be placed at" \ - "\\\"\\\${DISTDIR}/\\\${FILE}\\\". Refer to make.conf(5) for" \ - "information about FETCHCOMMAND and RESUMECOMMAND." | \ - fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done - warning_shown=1 - fi - if [ $warning_shown = 1 ] ; then - ewarn # for symmetry - fi -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/portage/pym -} diff --git a/sys-apps/portage/portage-2.1.6.13.ebuild b/sys-apps/portage/portage-2.1.6.13.ebuild index e2c9987e380a..673644394343 100644 --- a/sys-apps/portage/portage-2.1.6.13.ebuild +++ b/sys-apps/portage/portage-2.1.6.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.1 2009/05/03 21:41:48 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.2 2009/06/03 18:39:24 zmedico Exp $ inherit eutils multilib python @@ -12,7 +12,7 @@ PROVIDE="virtual/portage" SLOT="0" IUSE="build doc epydoc selinux linguas_pl" -python_dep=">=dev-lang/python-2.4" +python_dep=">=dev-lang/python-2.5" DEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 ) @@ -31,7 +31,6 @@ PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) - || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) )" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # rsync-2.6.4 rdep is for the --filter option #167668 diff --git a/sys-apps/portage/portage-2.2_rc28.ebuild b/sys-apps/portage/portage-2.2_rc28.ebuild deleted file mode 100644 index d8635e4ae74e..000000000000 --- a/sys-apps/portage/portage-2.2_rc28.ebuild +++ /dev/null @@ -1,323 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc28.ebuild,v 1.1 2009/03/27 20:19:15 zmedico Exp $ - -inherit eutils multilib python - -DESCRIPTION="Portage is the 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" -IUSE="build doc epydoc selinux linguas_pl" - -python_dep=">=dev-lang/python-2.4" - -DEPEND="${python_dep} - !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="${python_dep} - !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 - >=app-admin/eselect-news-20071201 ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=dev-python/python-selinux-2.16 )" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) - )" -# 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" - -prefix_src_archives() { - local x y - for x in ${@}; do - for y in ${SRC_ARCHIVES}; do - echo ${y}/${x} - done - done -} - -PV_PL="2.1.2" -PATCHVER_PL="" -TARBALL_PV="2.2_rc15" -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) - linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 - $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" - -PATCHVER=$PV -if [ -n "${PATCHVER}" ]; then - SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 - $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" -fi - -S="${WORKDIR}"/${PN}-${TARBALL_PV} -S_PL="${WORKDIR}"/${PN}-${PV_PL} - -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/__init__.py || \ - die "Failed to patch portage.VERSION" -} - -src_compile() { - - if use doc; then - cd "${S}"/doc - touch fragment/date - make xhtml xhtml-nochunks || die "failed to make docs" - fi - - if use epydoc; then - einfo "Generating api docs" - mkdir "${WORKDIR}"/api - local my_modules epydoc_opts="" - # A name collision between the portage.dbapi class and the - # module with the same name triggers an epydoc crash unless - # portage.dbapi is excluded from introspection. - ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \ - epydoc_opts='--exclude-introspect portage\.dbapi' - my_modules="$(find "${S}/pym" -name "*.py" \ - | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ - -e 's:/:.:g' | sort)" || die "error listing modules" - PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --no-frames --show-imports $epydoc_opts \ - --name "${PN}" --url "${HOMEPAGE}" \ - ${my_modules} || die "epydoc failed" - fi -} - -src_test() { - ./pym/portage/tests/runTests || \ - die "test(s) failed" -} - -src_install() { - local libdir=$(get_libdir) - local portage_base="/usr/${libdir}/portage" - local portage_share_config=/usr/share/portage/config - - cd "${S}"/cnf - insinto /etc - doins etc-update.conf dispatch-conf.conf - - dodir "${portage_share_config}" - insinto "${portage_share_config}" - doins "${S}/cnf/"{sets.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 - - dosym ..${portage_share_config}/make.globals /etc/make.globals - - 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/ebuild-helpers/sed || die "Failed to remove sed wrapper" - fi - - cd "${S}"/bin || die "cd failed" - doexe $(find . -maxdepth 1 -type f) || die "doexe failed" - - local symlinks - dodir ${portage_base}/bin/ebuild-helpers || die "dodir failed" - exeinto ${portage_base}/bin/ebuild-helpers || die "exeinto failed" - cd "${S}"/bin/ebuild-helpers || die "cd failed" - doexe $(find . -type f ! -type l) || die "doexe failed" - symlinks=$(find . -type l) - if [ -n "$symlinks" ] ; then - cp -P $symlinks "${D}${portage_base}/bin/ebuild-helpers/" || \ - die "cp failed" - fi - - # These symlinks will be included in the next tarball. - # Until then, create them manually. - dosym ../portageq ${portage_base}/bin/ebuild-helpers/portageq || \ - die "dosym failed" - local x - for x in eerror einfo ewarn eqawarn ; do - dosym elog ${portage_base}/bin/ebuild-helpers/$x || die "dosym failed" - done - - for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do - dodir ${portage_base}/${mydir} - insinto ${portage_base}/${mydir} - cd "${S}"/${mydir} - doins *.py - symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) - [ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}" - done - - # Symlinks to directories cause up/downgrade issues and the use of these - # modules outside of portage is probably negligible. - for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do - [ ! -L "${x}" ] && continue - die "symlink to directory will cause upgrade/downgrade issues: '${x}'" - done - - exeinto ${portage_base}/pym/portage/tests - doexe "${S}"/pym/portage/tests/runTests - - 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,NEWS,RELEASE-NOTES} - use doc && dohtml -r "${S}"/doc/* - use epydoc && dohtml -r "${WORKDIR}"/api - - dodir /usr/bin - for x in ebuild emerge portageq repoman 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 -} - -pkg_preinst() { - if ! use build && ! has_version dev-python/pycrypto && \ - has_version '>=dev-lang/python-2.5' ; then - if ! built_with_use '>=dev-lang/python-2.5' ssl ; then - ewarn "If you are an ebuild developer and you plan to commit ebuilds" - ewarn "with this system then please install dev-python/pycrypto or" - ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order" - ewarn "to enable RMD160 hash support." - ewarn "See bug #198398 for more information." - fi - fi - if [ -f "${ROOT}/etc/make.globals" ]; then - rm "${ROOT}/etc/make.globals" - fi - - has_version ">=${CATEGORY}/${PN}-2.2_alpha" - MINOR_UPGRADE=$? - - has_version "<=${CATEGORY}/${PN}-2.2_pre5" - WORLD_MIGRATION_UPGRADE=$? - - # If portage-2.1.6 is installed and the preserved_libs_registry exists, - # assume that the NEEDED.ELF.2 files have already been generated. - has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \ - ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \ - has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) - NEEDED_REBUILD_UPGRADE=$? - - has_version "<${CATEGORY}/${PN}-2.2_alpha" - ADD_SYSTEM_TO_WORLD=$? - - if [ $ADD_SYSTEM_TO_WORLD != 0 -a "$ROOT" != / ] && \ - ! has_version "${CATEGORY}/${PN}" ; then - # building stage 1 - ADD_SYSTEM_TO_WORLD=0 - fi -} - -pkg_postinst() { - # Compile all source files recursively. Any orphans - # will be identified and removed in postrm. - python_mod_optimize /usr/$(get_libdir)/portage/pym - - if [ $ADD_SYSTEM_TO_WORLD = 0 ] && \ - [ ! -e "$ROOT"var/lib/portage/world_sets ] ; then - einfo "adding @system to world_sets for backward compatibility" - echo @system > "$ROOT"var/lib/portage/world_sets - fi - - if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then - einfo "moving set references from the worldfile into world_sets" - cd "${ROOT}/var/lib/portage/" - grep "^@" world >> world_sets - sed -i -e '/^@/d' world - fi - - if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then - einfo "rebuilding NEEDED.ELF.2 files" - for cpv in "${ROOT}/var/db/pkg"/*/*; do - if [ -f "${cpv}/NEEDED" ]; then - rm -f "${cpv}/NEEDED.ELF.2" - while read line; do - filename=${line% *} - needed=${line#* } - needed=${needed//+/++} - needed=${needed//#/##} - needed=${needed//%/%%} - newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) - newline=${newline// - } - echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" - done < "${cpv}/NEEDED" - fi - done - fi - - einfo - einfo "For help with using portage please consult the Gentoo Handbook" - einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" - einfo - - if [ $MINOR_UPGRADE = 0 ] ; then - elog "If you're upgrading from a pre-2.2 version of portage you might" - elog "want to remerge world (emerge -e world) to take full advantage" - elog "of some of the new features in 2.2." - elog "This is not required however for portage to function properly." - elog - fi - - if [ -z "${PV/*_pre*}" ]; then - elog "If you always want to use the latest development version of portage" - elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml" - elog - fi -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/portage/pym -} diff --git a/sys-apps/portage/portage-2.2_rc31.ebuild b/sys-apps/portage/portage-2.2_rc31.ebuild deleted file mode 100644 index 1a8c19377c12..000000000000 --- a/sys-apps/portage/portage-2.2_rc31.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc31.ebuild,v 1.1 2009/04/19 23:28:13 zmedico Exp $ - -inherit eutils multilib python - -DESCRIPTION="Portage is the 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" -IUSE="build doc epydoc selinux linguas_pl" - -python_dep=">=dev-lang/python-2.4" - -DEPEND="${python_dep} - !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="${python_dep} - !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 - >=app-admin/eselect-news-20071201 ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=dev-python/python-selinux-2.16 )" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) - )" -# 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" - -prefix_src_archives() { - local x y - for x in ${@}; do - for y in ${SRC_ARCHIVES}; do - echo ${y}/${x} - done - done -} - -PV_PL="2.1.2" -PATCHVER_PL="" -TARBALL_PV="2.2_rc15" -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) - linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 - $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" - -PATCHVER=$PV -if [ -n "${PATCHVER}" ]; then - SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 - $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" -fi - -S="${WORKDIR}"/${PN}-${TARBALL_PV} -S_PL="${WORKDIR}"/${PN}-${PV_PL} - -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/__init__.py || \ - die "Failed to patch portage.VERSION" -} - -src_compile() { - - if use doc; then - cd "${S}"/doc - touch fragment/date - make xhtml xhtml-nochunks || die "failed to make docs" - fi - - if use epydoc; then - einfo "Generating api docs" - mkdir "${WORKDIR}"/api - local my_modules epydoc_opts="" - # A name collision between the portage.dbapi class and the - # module with the same name triggers an epydoc crash unless - # portage.dbapi is excluded from introspection. - ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \ - epydoc_opts='--exclude-introspect portage\.dbapi' - my_modules="$(find "${S}/pym" -name "*.py" \ - | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ - -e 's:/:.:g' | sort)" || die "error listing modules" - PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --no-frames --show-imports $epydoc_opts \ - --name "${PN}" --url "${HOMEPAGE}" \ - ${my_modules} || die "epydoc failed" - fi -} - -src_test() { - ./pym/portage/tests/runTests || \ - die "test(s) failed" -} - -src_install() { - local libdir=$(get_libdir) - local portage_base="/usr/${libdir}/portage" - local portage_share_config=/usr/share/portage/config - - cd "${S}"/cnf - insinto /etc - doins etc-update.conf dispatch-conf.conf - - dodir "${portage_share_config}" - insinto "${portage_share_config}" - doins "${S}/cnf/"{sets.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 - - dosym ..${portage_share_config}/make.globals /etc/make.globals - - 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/ebuild-helpers/sed || die "Failed to remove sed wrapper" - fi - - cd "${S}"/bin || die "cd failed" - doexe $(find . -maxdepth 1 -type f) || die "doexe failed" - - local symlinks - dodir ${portage_base}/bin/ebuild-helpers || die "dodir failed" - exeinto ${portage_base}/bin/ebuild-helpers || die "exeinto failed" - cd "${S}"/bin/ebuild-helpers || die "cd failed" - doexe $(find . -type f ! -type l) || die "doexe failed" - symlinks=$(find . -type l) - if [ -n "$symlinks" ] ; then - cp -P $symlinks "${D}${portage_base}/bin/ebuild-helpers/" || \ - die "cp failed" - fi - - # These symlinks will be included in the next tarball. - # Until then, create them manually. - dosym ../portageq ${portage_base}/bin/ebuild-helpers/portageq || \ - die "dosym failed" - local x - for x in eerror einfo ewarn eqawarn ; do - dosym elog ${portage_base}/bin/ebuild-helpers/$x || die "dosym failed" - done - - for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do - dodir ${portage_base}/${mydir} - insinto ${portage_base}/${mydir} - cd "${S}"/${mydir} - doins *.py - symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) - [ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}" - done - - # Symlinks to directories cause up/downgrade issues and the use of these - # modules outside of portage is probably negligible. - for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do - [ ! -L "${x}" ] && continue - die "symlink to directory will cause upgrade/downgrade issues: '${x}'" - done - - exeinto ${portage_base}/pym/portage/tests - doexe "${S}"/pym/portage/tests/runTests - - 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,NEWS,RELEASE-NOTES} - use doc && dohtml -r "${S}"/doc/* - use epydoc && dohtml -r "${WORKDIR}"/api - - dodir /usr/bin - for x in ebuild egencache emerge portageq repoman 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 -} - -pkg_preinst() { - if ! use build && ! has_version dev-python/pycrypto && \ - has_version '>=dev-lang/python-2.5' ; then - if ! built_with_use '>=dev-lang/python-2.5' ssl ; then - ewarn "If you are an ebuild developer and you plan to commit ebuilds" - ewarn "with this system then please install dev-python/pycrypto or" - ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order" - ewarn "to enable RMD160 hash support." - ewarn "See bug #198398 for more information." - fi - fi - if [ -f "${ROOT}/etc/make.globals" ]; then - rm "${ROOT}/etc/make.globals" - fi - - has_version ">=${CATEGORY}/${PN}-2.2_alpha" - MINOR_UPGRADE=$? - - has_version "<=${CATEGORY}/${PN}-2.2_pre5" - WORLD_MIGRATION_UPGRADE=$? - - # If portage-2.1.6 is installed and the preserved_libs_registry exists, - # assume that the NEEDED.ELF.2 files have already been generated. - has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \ - ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \ - has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) - NEEDED_REBUILD_UPGRADE=$? - - has_version "<${CATEGORY}/${PN}-2.2_alpha" - ADD_SYSTEM_TO_WORLD=$? - - if [ $ADD_SYSTEM_TO_WORLD != 0 -a "$ROOT" != / ] && \ - ! has_version "${CATEGORY}/${PN}" ; then - # building stage 1 - ADD_SYSTEM_TO_WORLD=0 - fi - - [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.2_rc29" - REPO_LAYOUT_CONF_WARN=$? -} - -pkg_postinst() { - # Compile all source files recursively. Any orphans - # will be identified and removed in postrm. - python_mod_optimize /usr/$(get_libdir)/portage/pym - - if [ $ADD_SYSTEM_TO_WORLD = 0 ] && \ - [ ! -e "$ROOT"var/lib/portage/world_sets ] ; then - einfo "adding @system to world_sets for backward compatibility" - echo @system > "$ROOT"var/lib/portage/world_sets - fi - - if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then - einfo "moving set references from the worldfile into world_sets" - cd "${ROOT}/var/lib/portage/" - grep "^@" world >> world_sets - sed -i -e '/^@/d' world - fi - - if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then - einfo "rebuilding NEEDED.ELF.2 files" - for cpv in "${ROOT}/var/db/pkg"/*/*; do - if [ -f "${cpv}/NEEDED" ]; then - rm -f "${cpv}/NEEDED.ELF.2" - while read line; do - filename=${line% *} - needed=${line#* } - needed=${needed//+/++} - needed=${needed//#/##} - needed=${needed//%/%%} - newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) - newline=${newline// - } - echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" - done < "${cpv}/NEEDED" - fi - done - fi - - if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then - ewarn - echo "If you want overlay eclasses to override eclasses from" \ - "other repos then see the portage(5) man page" \ - "for information about the new layout.conf and repos.conf" \ - "configuration files." \ - | fmt -w 75 | while read ; do ewarn "$REPLY" ; done - ewarn - fi - - einfo - einfo "For help with using portage please consult the Gentoo Handbook" - einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" - einfo - - if [ $MINOR_UPGRADE = 0 ] ; then - elog "If you're upgrading from a pre-2.2 version of portage you might" - elog "want to remerge world (emerge -e world) to take full advantage" - elog "of some of the new features in 2.2." - elog "This is not required however for portage to function properly." - elog - fi - - if [ -z "${PV/*_pre*}" ]; then - elog "If you always want to use the latest development version of portage" - elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml" - elog - fi -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/portage/pym -} diff --git a/sys-apps/portage/portage-2.2_rc32.ebuild b/sys-apps/portage/portage-2.2_rc32.ebuild deleted file mode 100644 index 735ade68b000..000000000000 --- a/sys-apps/portage/portage-2.2_rc32.ebuild +++ /dev/null @@ -1,342 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc32.ebuild,v 1.1 2009/05/02 02:22:07 zmedico Exp $ - -inherit eutils multilib python - -DESCRIPTION="Portage is the 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" -IUSE="build doc epydoc selinux linguas_pl" - -python_dep=">=dev-lang/python-2.4" - -DEPEND="${python_dep} - !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="${python_dep} - !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 - >=app-admin/eselect-news-20071201 ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=dev-python/python-selinux-2.16 )" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) - )" -# 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" - -prefix_src_archives() { - local x y - for x in ${@}; do - for y in ${SRC_ARCHIVES}; do - echo ${y}/${x} - done - done -} - -PV_PL="2.1.2" -PATCHVER_PL="" -TARBALL_PV="2.2_rc15" -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) - linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 - $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" - -PATCHVER=$PV -if [ -n "${PATCHVER}" ]; then - SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 - $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" -fi - -S="${WORKDIR}"/${PN}-${TARBALL_PV} -S_PL="${WORKDIR}"/${PN}-${PV_PL} - -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/__init__.py || \ - die "Failed to patch portage.VERSION" -} - -src_compile() { - - if use doc; then - cd "${S}"/doc - touch fragment/date - make xhtml xhtml-nochunks || die "failed to make docs" - fi - - if use epydoc; then - einfo "Generating api docs" - mkdir "${WORKDIR}"/api - local my_modules epydoc_opts="" - # A name collision between the portage.dbapi class and the - # module with the same name triggers an epydoc crash unless - # portage.dbapi is excluded from introspection. - ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \ - epydoc_opts='--exclude-introspect portage\.dbapi' - my_modules="$(find "${S}/pym" -name "*.py" \ - | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ - -e 's:/:.:g' | sort)" || die "error listing modules" - PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --no-frames --show-imports $epydoc_opts \ - --name "${PN}" --url "${HOMEPAGE}" \ - ${my_modules} || die "epydoc failed" - fi -} - -src_test() { - ./pym/portage/tests/runTests || \ - die "test(s) failed" -} - -src_install() { - local libdir=$(get_libdir) - local portage_base="/usr/${libdir}/portage" - local portage_share_config=/usr/share/portage/config - - cd "${S}"/cnf - insinto /etc - doins etc-update.conf dispatch-conf.conf - - dodir "${portage_share_config}" - insinto "${portage_share_config}" - doins "${S}/cnf/"{sets.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 - - dosym ..${portage_share_config}/make.globals /etc/make.globals - - 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/ebuild-helpers/sed || die "Failed to remove sed wrapper" - fi - - cd "${S}"/bin || die "cd failed" - doexe $(find . -maxdepth 1 -type f) || die "doexe failed" - - local symlinks - dodir ${portage_base}/bin/ebuild-helpers/3 || die "dodir failed" - exeinto ${portage_base}/bin/ebuild-helpers || die "exeinto failed" - cd "${S}"/bin/ebuild-helpers || die "cd failed" - doexe $(find . -type f ! -type l) || die "doexe failed" - symlinks=$(find . -type l) - if [ -n "$symlinks" ] ; then - cp -P $symlinks "${D}${portage_base}/bin/ebuild-helpers/" || \ - die "cp failed" - fi - exeinto ${portage_base}/bin/ebuild-helpers/3 || die "exeinto failed" - doexe 3/dodoc - - # These symlinks will be included in the next tarball. - # Until then, create them manually. - dosym ../portageq ${portage_base}/bin/ebuild-helpers/portageq || \ - die "dosym failed" - local x - for x in eerror einfo ewarn eqawarn ; do - dosym elog ${portage_base}/bin/ebuild-helpers/$x || die "dosym failed" - done - for x in dohard dosed ; do - dosym ../../banned-helper ${portage_base}/bin/ebuild-helpers/3/$x \ - || die "dosym failed" - done - - for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do - dodir ${portage_base}/${mydir} - insinto ${portage_base}/${mydir} - cd "${S}"/${mydir} - doins *.py - symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) - [ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}" - done - - # Symlinks to directories cause up/downgrade issues and the use of these - # modules outside of portage is probably negligible. - for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do - [ ! -L "${x}" ] && continue - die "symlink to directory will cause upgrade/downgrade issues: '${x}'" - done - - exeinto ${portage_base}/pym/portage/tests - doexe "${S}"/pym/portage/tests/runTests - - 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,NEWS,RELEASE-NOTES} - use doc && dohtml -r "${S}"/doc/* - use epydoc && dohtml -r "${WORKDIR}"/api - - dodir /usr/bin - for x in ebuild egencache emerge portageq repoman 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 -} - -pkg_preinst() { - if ! use build && ! has_version dev-python/pycrypto && \ - has_version '>=dev-lang/python-2.5' ; then - if ! built_with_use '>=dev-lang/python-2.5' ssl ; then - ewarn "If you are an ebuild developer and you plan to commit ebuilds" - ewarn "with this system then please install dev-python/pycrypto or" - ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order" - ewarn "to enable RMD160 hash support." - ewarn "See bug #198398 for more information." - fi - fi - if [ -f "${ROOT}/etc/make.globals" ]; then - rm "${ROOT}/etc/make.globals" - fi - - has_version ">=${CATEGORY}/${PN}-2.2_alpha" - MINOR_UPGRADE=$? - - has_version "<=${CATEGORY}/${PN}-2.2_pre5" - WORLD_MIGRATION_UPGRADE=$? - - # If portage-2.1.6 is installed and the preserved_libs_registry exists, - # assume that the NEEDED.ELF.2 files have already been generated. - has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \ - ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \ - has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) - NEEDED_REBUILD_UPGRADE=$? - - has_version "<${CATEGORY}/${PN}-2.2_alpha" - ADD_SYSTEM_TO_WORLD=$? - - if [ $ADD_SYSTEM_TO_WORLD != 0 -a "$ROOT" != / ] && \ - ! has_version "${CATEGORY}/${PN}" ; then - # building stage 1 - ADD_SYSTEM_TO_WORLD=0 - fi - - [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" - REPO_LAYOUT_CONF_WARN=$? -} - -pkg_postinst() { - # Compile all source files recursively. Any orphans - # will be identified and removed in postrm. - python_mod_optimize /usr/$(get_libdir)/portage/pym - - if [ $ADD_SYSTEM_TO_WORLD = 0 ] && \ - [ ! -e "$ROOT"var/lib/portage/world_sets ] ; then - einfo "adding @system to world_sets for backward compatibility" - echo @system > "$ROOT"var/lib/portage/world_sets - fi - - if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then - einfo "moving set references from the worldfile into world_sets" - cd "${ROOT}/var/lib/portage/" - grep "^@" world >> world_sets - sed -i -e '/^@/d' world - fi - - if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then - einfo "rebuilding NEEDED.ELF.2 files" - for cpv in "${ROOT}/var/db/pkg"/*/*; do - if [ -f "${cpv}/NEEDED" ]; then - rm -f "${cpv}/NEEDED.ELF.2" - while read line; do - filename=${line% *} - needed=${line#* } - needed=${needed//+/++} - needed=${needed//#/##} - needed=${needed//%/%%} - newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) - newline=${newline// - } - echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" - done < "${cpv}/NEEDED" - fi - done - fi - - if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then - ewarn - echo "If you want overlay eclasses to override eclasses from" \ - "other repos then see the portage(5) man page" \ - "for information about the new layout.conf and repos.conf" \ - "configuration files." \ - | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done - ewarn - fi - - einfo - einfo "For help with using portage please consult the Gentoo Handbook" - einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" - einfo - - if [ $MINOR_UPGRADE = 0 ] ; then - elog "If you're upgrading from a pre-2.2 version of portage you might" - elog "want to remerge world (emerge -e world) to take full advantage" - elog "of some of the new features in 2.2." - elog "This is not required however for portage to function properly." - elog - fi - - if [ -z "${PV/*_pre*}" ]; then - elog "If you always want to use the latest development version of portage" - elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml" - elog - fi -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/portage/pym -} diff --git a/sys-apps/portage/portage-2.2_rc33.ebuild b/sys-apps/portage/portage-2.2_rc33.ebuild index 5092696dae91..1760acd995be 100644 --- a/sys-apps/portage/portage-2.2_rc33.ebuild +++ b/sys-apps/portage/portage-2.2_rc33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc33.ebuild,v 1.2 2009/06/03 02:51:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc33.ebuild,v 1.3 2009/06/03 18:39:24 zmedico Exp $ inherit eutils multilib python @@ -12,7 +12,7 @@ PROVIDE="virtual/portage" SLOT="0" IUSE="build doc epydoc selinux linguas_pl" -python_dep=">=dev-lang/python-2.4" +python_dep=">=dev-lang/python-2.5" DEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 ) @@ -31,7 +31,6 @@ PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) - || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) )" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # rsync-2.6.4 rdep is for the --filter option #167668 |