Bump to avoid using versioned names.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 23 insertions, 24 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 3305e2d288dc..72560673cd3b 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.108 2012/11/05 18:23:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.109 2012/11/08 03:19:21 flameeyes Exp $
+
+*boost-build-1.52.0-r1 (08 Nov 2012)
+
+  08 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +boost-build-1.52.0-r1.ebuild, -boost-build-1.52.0.ebuild:
+  Bump to avoid using versioned names.
 
 *boost-build-1.52.0 (05 Nov 2012)
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 416d5ed9be56..56ecbad7d240 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -14,17 +14,17 @@ DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3
 EBUILD boost-build-1.46.1.ebuild 3275 SHA256 75a659bc6f3c58d00596fbc8e5507a3e54c99e6b6093c45ef2c20e4877382f8a SHA512 c1885d403dae63dff6338988b9843eb24e755613b7c920bd5247779fcbda4c63848737dd79e2eaf964320c29d84ce0dd72bb52e032b77775857d4883cdc3a5d0 WHIRLPOOL 9145e6ed21de86cb93cf064e3a3cc363bb978eebc4c2365b280ea74ea655dcc74a87098089e26553d04dc346e1fcd8a4c9e0e0a1170292055e17a3fe8d3da917
 EBUILD boost-build-1.49.0.ebuild 3409 SHA256 255344ee046ebdb39073ec68058629fc1c13f6b396f7e8b38b7d56f10de5cd21 SHA512 8b0cad7b8af43843d0a004494cdfb396cfafe26fd78095fcc8dabccb89cca0250868c7f1e76955fab1829869eae5741739cf848128c304c57251ba35d4dd1ac3 WHIRLPOOL df250e18c580f16decae85b73d6121a2e28042b34eebfd6b8589fdb568ce55a3a62b3c23a1ffaca83b2f1a5576128678f476449087a46216504f6c025273f3e9
 EBUILD boost-build-1.51.0.ebuild 3869 SHA256 64d0e2710615e1c6721e00f667b6b06a4a12978a8ac23e43a6ca34e20225d833 SHA512 4daaf709b8e0dcbaaca4cf8cc4d5e35d245f2a070055ab2a32bba34129695ed375ec6ace9d28ae6cd70a8e9c7456b6df0e9fcfec65a5fc5a14e08d10faf4308a WHIRLPOOL 805b892ff901208381f1d593526feed36a0d224f2bfa67e43a09e70370a5ef945fc7c038f44c6652e2bbb0dfe8178d7fb2dfe3589b5d170c8b50ef4278e7b1da
-EBUILD boost-build-1.52.0.ebuild 3867 SHA256 f3a57eced832e97f3146747481b027d4f65a9488a7b3f44565345f97f2d747cc SHA512 5ef0c87de29beda78e7a6c022029948ca8985f547ae9fd7053a7c36beeec39410bcc42ba9b17cce8d3b6092e5adaa397ad5016a646361b678b186f4cd720797f WHIRLPOOL e4268babf3c92aee35f49b6320a2066d62016153c9f7c15fd3a2ea7b94f4de915b55ca2fd6cf8cab987d4f82812b8f217ee3c880be2896bc8d31d2e10df4ec84
-MISC ChangeLog 15779 SHA256 f578837c265fad8939102b7af5cf77615dfcc43fb7d0d6fbc3597ebaed496fe1 SHA512 ffb791cd0a0fb1142f47d08331b74c8fcf83caaa97328c1ca1982d47ed1906eb356656aacaa8351110dc56f893dc8e5088f0e47506a75db81999e80ddcfe8060 WHIRLPOOL ddc385b972767b713198eb532d4ec50c9e79baa683cf92e00694aeac760ff9f9bc2b0c5d616db1e1a763f6df8c76c3554c31bc7aff1a23235e503ec6360f1c68
+EBUILD boost-build-1.52.0-r1.ebuild 3542 SHA256 6c67e67219ccfdf4e54d9a89f246641d61174419d9420ac60ba8d02d486b4e21 SHA512 bb3b7e201571a8783cc2cdd582e9c1947c2d99c44482f5b7af0c8bdb9a268801161d48a16c486a4cd0ec5ebdbd28c5711e442147eeb747004235487464a07d4c WHIRLPOOL daaf8db7413ef7aa7e24683ec48d40d66a18923d9676a77ebf2c4de3e52ba76422168f236681c3c95e6ae21a6fc879061205e3d1146d8864bfaa20f9e6b07595
+MISC ChangeLog 15974 SHA256 f72a282d0a1ade5d3e93bc68580b256af953b26478a6174157841704d37b325b SHA512 5f14dc364f342e2fa4d1a2ebab6baa3709497afe384354717b03fd448b9613ac70b7aeff456622985013f0ea1984292a09ac537984d80d2b582149dbffe9144c WHIRLPOOL 3b2827da336ab1369ed0c7b6d40e8fe91af3459a7aaf71b48567c04fb63e2bc824903fffbea8e796be0109a0709b125584808f7b3db5b98fa7f4f4a2245ee2e1
 MISC metadata.xml 158 SHA256 b52dff4a9d9f4eab0428972c9ee5a96df08f39325e4b491c39493da499fedf51 SHA512 5300260c2c2bad38b7a27b5c1d609b48b105034c63807958425e8f8fbcccc02a408bb5565480bb3ee3c87d368ed16859c48b447241adf15896e7508c6c442e65 WHIRLPOOL 17880f728fdb3dbd6ca582547c3c546ffe798d89d37ac717bc0be4e4764b60b867979c996ca89f4fdeedee021c419b964405b5fb674a220e582a436f653b8f30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQmAR6AAoJEBzRPIrUMBNCHsAIAJRe11yIXCS0XB0+wAD/uf4Z
-ERvKIHXm9C7VrbhE7Fari2zGwyXQie+kkR6L5WKnaEz7aFdCgoIydFhANZ80ORL2
-4iIb03d+eDTpaNC/TGs5LxzmsycF1yT6fhJwCCdcIcRf9MRV+zwVhbV05rXzXJy1
-MVO3KnKs8CeI/UBqKAKzyjimWJZi0+M2LSUlwKz9C88uNh5LHC3gP6HoT6XnL239
-GG8t+/KsPatQZPZaEqGJfEc4myUcY2RDCX4Zz/v6t6qAt68MhmxTsvDw/HGhz58Z
-lCDi4CtXmwNXmYhwhoOGHmbYPLIi33jMvvJuqZcgW8Jrri0/BygpseGqPzO914o=
-=baqk
+iQEcBAEBCAAGBQJQmyS+AAoJEBzRPIrUMBNCJKoH/jLtXq738Dfku5gbj9nSLbtt
+WLdnX3bXrduF5z2BazPelObJZ853N1KqDb1ywS8y+ONe3lZhJMspJgjNv8Pv3ofH
+CpOTb3l3kaCDyNIsaxYMNY1O7aKwjF6lI0ZnqRAyRmKQvLDyIwOzT+UgXECIHzHz
+wJoltAyOErQBc+UzNO0V9NCTTpnzLItdWTJtLdyL1/opPVigwA4OTY8FGwGqbnSi
+PL+E4cEfb5VNNEJ+OaWteV9BM53yLYN60+dG0wjXlcucgNpRHLivYUDarvT/AMDJ
+weWcXBg6Iu2re89xNzx2Z5zZ6h3f3G6HP8dBY1IMhUJdLyuVcoxC4VgNvplGi/w=
+=nj71
 -----END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.52.0.ebuild b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
index 3f2145a6e1cd..f1fad4b36de1 100644
--- a/dev-util/boost-build/boost-build-1.52.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.52.0.ebuild,v 1.1 2012/11/05 18:23:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.52.0-r1.ebuild,v 1.1 2012/11/08 03:19:21 flameeyes Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? 2"
@@ -8,7 +8,6 @@ PYTHON_DEPEND="python? 2"
 inherit eutils flag-o-matic python toolchain-funcs versionator
 
 MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
 
 DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
 HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
@@ -66,11 +65,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		engine/Jambase || die "sed failed"
-
 	if use python; then
 		# replace versions by user-selected one (TODO: fix this when slot-op
 		# deps are available to always match the best version available)
@@ -96,17 +90,16 @@ src_compile() {
 }
 
 src_install() {
-	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
-	newbin engine/bin.*/b2 b2-${MAJOR_PV}
+	dobin engine/bin.*/{bjam,b2}
 
-	insinto /usr/share/boost-build-${MAJOR_PV}
+	insinto /usr/share/boost-build
 	doins -r "${FILESDIR}/site-config.jam" \
 		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
 		build kernel options tools util
 
-	rm "${D}/usr/share/boost-build-${MAJOR_PV}/build/project.ann.py" || die "removing faulty python file failed"
+	rm "${D}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
 	if ! use python; then
-		find "${D}/usr/share/boost-build-${MAJOR_PV}" -iname "*.py" -delete || die "removing experimental python files failed"
+		find "${D}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
 	fi
 
 	dodoc changes.txt hacking.txt release_procedure.txt \
@@ -132,9 +125,9 @@ src_test() {
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize /usr/share/boost-build-${MAJOR_PV}
+	use python && python_mod_optimize /usr/share/boost-build
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup /usr/share/boost-build-${MAJOR_PV}
+	use python && python_mod_cleanup /usr/share/boost-build
 }