Versio 6 slotted to 6

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 24 insertions, 15 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index c703b148432f..5fbd2144db8a 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.82 2011/03/05 11:42:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.83 2011/03/06 09:10:55 jlec Exp $
+
+*qwt-6.0.0_rc5-r1 (06 Mar 2011)
+
+  06 Mar 2011; Justin Lecher <jlec@gentoo.org> -qwt-6.0.0_rc5.ebuild,
+  +qwt-6.0.0_rc5-r1.ebuild:
+  Versio 6 slotted to 6
 
   05 Mar 2011; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild,
   qwt-6.0.0_rc5.ebuild:
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 8b9be90d399b..1c77cd8c2e1f 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -6,13 +6,13 @@ DIST qwt-5.2.1.tar.bz2 1926453 RMD160 28e07ea12323a5217118a38e1a7d730a8ce50fee S
 DIST qwt-6.0.0-rc5.tar.bz2 2482931 RMD160 8330e5ec74425b0a2f3b8541177a21b47afe0a54 SHA1 435cf30784c789fb5033287f376ac0f6dac3288e SHA256 5a1758105369ca0204142158d4b4d46a0227b8f101f45d129e55effc02dbc16a
 EBUILD qwt-5.2.0.ebuild 1798 RMD160 cbabd1cd4f51aa71c8adf4902abb97fc87815c92 SHA1 545d718d84036a9546262f8c6c705ba9fb6edf7f SHA256 260041676fa1a1c032a6cd76df89bfa3044191e5f81fc59276b584a3196d8159
 EBUILD qwt-5.2.1.ebuild 1788 RMD160 f27b1381bf52c5d4da8e59833e1d9a63c4cc56d4 SHA1 cb49dc14cdb898ed04dcf5517237d0fd67e835a9 SHA256 6710cac7fa39832dd61a8792b4682bede3d8ed02ca71ce466bed8ee4e7bf3cbd
-EBUILD qwt-6.0.0_rc5.ebuild 2074 RMD160 20744a7bd789e54dd1efb04802735da61d59b411 SHA1 6a5e9bdb28e3999f9f9c6b53a0ae195d1e3ee8ec SHA256 334011132572522a0df94cc09ceb20281dbcf9313c8c34eac42d8e8ce6643d6c
-MISC ChangeLog 10957 RMD160 c365ddce8217981eef31a1abfcb1bcba868f7e9e SHA1 f2a6d68a546f3c0dc8eab8ac20c4c51a746b261e SHA256 314ef3feff26c989f38d2998741b17a52209c3d488ad9ea3fa11d5ddb6c6d434
+EBUILD qwt-6.0.0_rc5-r1.ebuild 2121 RMD160 e48b0fc4ce9b6c8062fe40a85cd0c3e75179d2ea SHA1 1b50d163ac37ceee19f03c353b5bdb0e6e8f3a3a SHA256 05b5f04a4b7b0c3db99e54c3af7645d206f25580fbfe2ce21a5ead350babf6d9
+MISC ChangeLog 11113 RMD160 2d44f019b66289593ae669bfa42b310574847617 SHA1 4d854a0d4205ba24df7816c7eaf2e868f3bb0ace SHA256 2145fa06c3c12e12bd27727bffd09b88671c4cb30eaacafc20dd1c0c9562e14d
 MISC metadata.xml 510 RMD160 7a1780387ea1057ad0c03ebb0893b8b784dbb240 SHA1 33685ae6f5525901140d7edac99e3f1a0b01d430 SHA256 381cae2dbb6c2d0f63af9aa9f11f51c32cca49c390bf6c89d3b2534f31fd7466
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1yIbkACgkQgAnW8HDreRbwdwCfQxWKPEhjxiftRhxpYDSkiuO5
-N6kAoLnkmLXcBTPnqTZNfGwn31EMP5Uw
-=EI/K
+iEYEARECAAYFAk1zT6wACgkQgAnW8HDreRYWawCfV358XLu7HSo5OftgeP2/74jX
+OPMAn15/2MBxVAsP0pOzgjY6Gn6NGQjP
+=P+oi
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-6.0.0_rc5.ebuild b/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild
index a248498f0673..03899ba1e533 100644
--- a/x11-libs/qwt/qwt-6.0.0_rc5.ebuild
+++ b/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild,v 1.2 2011/03/05 11:42:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild,v 1.1 2011/03/06 09:10:55 jlec Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-beta/${PV/_/-}/${MY_P}.tar.bz2
 
 LICENSE="qwt"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
-SLOT="5"
+SLOT="6"
 IUSE="doc examples svg"
 
 DEPEND="
@@ -30,12 +30,12 @@ DOCS="CHANGES README"
 src_prepare() {
 	cat > qwtconfig.pri <<-EOF
 		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt5"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
 		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
 		QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
-		VERSION = ${PV}
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/$(get_libdir)/qt4/features"
+		VERSION = ${PV/_*}
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
 	EOF
 
 	cat > qwtbuild.pri <<-EOF
@@ -47,12 +47,15 @@ src_prepare() {
 		include( qwtconfig.pri )
 		TEMPLATE     = app
 		MOC_DIR      = moc
-		INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
-		DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
+		INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+		DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
 		LIBS        += -lqwt
 	EOF
 	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-	sed -i -e 's/target doc/target/' src/src.pro || die
+	sed \
+		-e 's/target doc/target/' \
+		-e "/^TARGET/s:qwt:qwt6:g" \
+		-i src/src.pro || die
 	use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
 	cp *.pri examples/ || die
 }