diff options
author | Thomas Sachau <tommy@gentoo.org> | 2009-10-11 12:46:54 +0000 |
---|---|---|
committer | Thomas Sachau <tommy@gentoo.org> | 2009-10-11 12:46:54 +0000 |
commit | 8364a98f9960340071db4e04b43bc04b7264878e (patch) | |
tree | 601e20a0bb12b2371d8ed833ef6c05ea1b31ddb0 /sys-apps | |
parent | Update ptlib dependency to require a version bigger than 2.6.2 which breaks c... (diff) | |
download | historical-8364a98f9960340071db4e04b43bc04b7264878e.tar.gz historical-8364a98f9960340071db4e04b43bc04b7264878e.tar.bz2 historical-8364a98f9960340071db4e04b43bc04b7264878e.zip |
Some cleanup + QA fixes, ok by zmedico
Package-Manager: portage-2.2_rc45-r1/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 12 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.2_rc45.ebuild | 15 |
3 files changed, 18 insertions, 15 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index a8b20b93b1ed..e74b4d2295a6 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,10 @@ # 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.639 2009/10/11 00:35:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.640 2009/10/11 12:46:54 tommy Exp $ + + 11 Oct 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + portage-2.2_rc45.ebuild: + Some cleanup + QA fixes, ok by zmedico *portage-2.2_rc45 (10 Oct 2009) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 9bca75f5510a..033465eafab4 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -25,13 +25,15 @@ EBUILD portage-2.2_rc33.ebuild 10578 RMD160 3542800e0ba7d29ed00d74a15a3ccbb55170 EBUILD portage-2.2_rc41.ebuild 9853 RMD160 b59699be6e4b25104fd56105814624b4bd00403f SHA1 a31c918762acb1c9f1aad325be9e3747c0eb8307 SHA256 f41181045ad2eca98d5b70acce9885bac803a7bd5cfa48d7c62f967c10e6da5c EBUILD portage-2.2_rc42.ebuild 10577 RMD160 ea085da802ee8464cadf3a168377f2254835d506 SHA1 23e4c7b50482944f03dcf711515930ed6928ca0b SHA256 94e7b7ed0830c3f73d0a1eab1795b21edecc35fbda9cc6bd6d73f558225521da EBUILD portage-2.2_rc44.ebuild 10541 RMD160 6d003419669515f07586c4b030357c299198f3a9 SHA1 5b8b632d0ef8a07e5921fc5b1b353136f504204d SHA256 90673079ccd653a92dd7f1a7fba5aac8c59f5a56477bf53baf4afa7bc9500a88 -EBUILD portage-2.2_rc45.ebuild 10541 RMD160 b3c56ce1bf58c04ffd9c93859bb0ae296779128c SHA1 a9939cb8dc215fb8026ff0014cddd859afb31d9a SHA256 77c5034e46cfa82b661d9eb574c505fe287d202569908ad0f9f4aaad933e664e -MISC ChangeLog 43888 RMD160 bddfd74e4f55d6b67134f8c06c1654e0e2ab37f5 SHA1 12823a0e1e9baa5a8c0fcb760e988ff297649715 SHA256 5e1e290e17cbfdac518bc49efa273505d47c074da222f76dd1a4ab2c86cf8f0f +EBUILD portage-2.2_rc45.ebuild 10447 RMD160 a3f81dc76b80ea6699b5c320646d433a34e1f3ee SHA1 29c95b179358b0f3787cf80df3c26ef764e0565e SHA256 cdb739099c3863d5a4f16c2db96332d0230d725316a4ff0e8c67ebcb62bd51dd +MISC ChangeLog 44014 RMD160 f1e7b1494b34147d41addd5126fa2fefb7d9c821 SHA1 ebf22c5064e6227995b07a8f200678a72ab27934 SHA256 f70b5274201682d9e0c9a63ef8bd8488149725d7b7f0c7e4bc2f400fc0fb308b MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkrRKG0ACgkQ/ejvha5XGaMZWACcD/Z1tvlOnTN0JKZLn1xyZVTR -aj4Ani/STQ26gRQSCukZmcw0V5wAvgZu -=gZBO +iJwEAQECAAYFAkrR09EACgkQG7kqcTWJkGcx3QQAyR4tn6Y6HfAs3YMX2X32VVq0 +3LC/Zt7JZvmQ0wlL6YnzPKKs5BoVV1npkY9bETEdAWia67dMXapY8bITXelENXtX +odBtV9re39eIr6jwAs8eBFVhgaXVFLbinSc+0fwolc/rUHW6/FjJcjQFI4TvJcM0 +ntEe1Y0fT+R5AgfI6Pc= +=h4d2 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2_rc45.ebuild b/sys-apps/portage/portage-2.2_rc45.ebuild index c00a42f01d42..9bd8c0a63d0d 100644 --- a/sys-apps/portage/portage-2.2_rc45.ebuild +++ b/sys-apps/portage/portage-2.2_rc45.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_rc45.ebuild,v 1.1 2009/10/11 00:35:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc45.ebuild,v 1.2 2009/10/11 12:46:54 tommy Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -126,27 +126,26 @@ src_install() { cd "${S}"/cnf insinto /etc - doins etc-update.conf dispatch-conf.conf + doins etc-update.conf dispatch-conf.conf || die - dodir "${portage_share_config}" insinto "${portage_share_config}" - doins "${S}/cnf/"{sets.conf,make.globals} + doins "${S}/cnf/"{sets.conf,make.globals} || die 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 + newins make.conf make.conf.example || die 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 + newins make.conf make.conf.example || die fi dosym ..${portage_share_config}/make.globals /etc/make.globals insinto /etc/logrotate.d - doins "${S}"/cnf/logrotate.d/elog-save-summary + doins "${S}"/cnf/logrotate.d/elog-save-summary || die # BSD and OSX need a sed wrapper so that find/xargs work properly if use userland_GNU; then @@ -156,7 +155,6 @@ src_install() { local x symlinks for x in $(find "$S"/bin -type d) ; do x=${x#$S/} - dodir $portage_base/$x || die "dodir failed" exeinto $portage_base/$x || die "exeinto failed" cd "$S"/$x || die "cd failed" doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \ @@ -169,7 +167,6 @@ src_install() { for x in $(find "$S"/pym -type d) ; do x=${x#$S/} - dodir $portage_base/$x || die "dodir failed" insinto $portage_base/$x || die "insinto failed" cd "$S"/$x || die "cd failed" doins *.py || die "doins failed" |