Version bump. Remove old

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

3 files changed, 41 insertions, 16 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 10cd418a63ea..8a189b12bd60 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.88 2011/08/21 03:30:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.89 2011/09/08 14:29:41 hwoarang Exp $
+
+*qt-creator-2.3.0 (08 Sep 2011)
+
+  08 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
+  -qt-creator-2.3.0_beta.ebuild, +qt-creator-2.3.0.ebuild:
+  Version bump. Remove old
 
   21 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> qt-creator-2.2.1.ebuild:
   x86 stable wrt bug #378753
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index d343fde9caae..c6fccf74a59c 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -8,19 +8,29 @@ DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b9
 DIST qt-creator-2.1.0-src.zip 28181645 RMD160 16fdf6f03ab8ea6a567f4cd1cb58580772a9627b SHA1 f1d7abf92df7a9ba53eb9006ca189ac7203c0e9f SHA256 a68d80f158b5e0a0faffd1a9fe7ef8afda545a970557572f5a192ecd9db0b85a
 DIST qt-creator-2.2.0-src.zip 29849268 RMD160 d71a15f88b5dfd489189ba235b89e3d0ab916b30 SHA1 d6ee517ce6b045ad3172b50c39b58b43f131c66b SHA256 a5f9b204fe9005c8abb84955f01cfbb3603f032fdda87bbbb3c78041aba4849b
 DIST qt-creator-2.2.1-src.zip 29975538 RMD160 dc4b6d6306c770b0bcab3dbaf08cab19bc7c0100 SHA1 6a369dffa7ee52ae068d9ebb3616e29d185a5009 SHA256 7fa583e8363c88334847fe5487341c4e8e22172902f4e627254b22d15cd12eb7
-DIST qt-creator-2.3.0-beta-src.tar.gz 26154490 RMD160 76dda4c448ef49a9d880a3ec483da7ea9d8786fa SHA1 3169a844e74c9a6bd4fa1dd1681777ab427adc5f SHA256 b35145e5165052c10c97319e8019eb1179da7d2783f6998792735594893ccc48
+DIST qt-creator-2.3.0-src.tar.gz 26613891 RMD160 22b606ad15629a8e540a7a4ead1dcd62ab3dc72f SHA1 8fc14416b3f0f1fbb0e604d22142100bd475773f SHA256 45f195c2439d7146709295ca9f8117b1b917a1af3ba19219ed22d242c048433d
 EBUILD qt-creator-1.3.1-r1.ebuild 3510 RMD160 15f79ad9b3d95aa13391886552b41d36371a3a3c SHA1 46e954722ae1ef344750bede58070dae01ae8da2 SHA256 e56fb33e79a44ad557e18a5843b67ffe93ac1d45d5c9f9bb71fb5d16b24afddb
 EBUILD qt-creator-1.3.1-r2.ebuild 3594 RMD160 c1813c51ae773ea77fc39b6e0fc4edac9ab7a467 SHA1 807387b02e547a29587378b79f8c027959a533cf SHA256 66183247bb735614578ca42a83cdc603561b600dad7eba8a8db95842932abd7c
 EBUILD qt-creator-2.1.0.ebuild 4358 RMD160 92eb6b55c89cf4fb90c01b7b6059c5b672aab8a9 SHA1 7a3eea0e523ddd28033649b04b181bd5ca822c38 SHA256 2c54c3eda44c41a5c51e7eb11d5bad5e269d474fe71c7670d849435231158b0b
 EBUILD qt-creator-2.2.0-r1.ebuild 3924 RMD160 72bab0d56e26ab107ddcf2da996aca9a5a7f0f45 SHA1 80b7a06a3dd6030db0f922f33d74f17700042cc8 SHA256 dbf5a06de37a0c3eb53046194cf7d44f5ad19c97b732e3aae3510c96009486c1
 EBUILD qt-creator-2.2.1.ebuild 3921 RMD160 6defad916e217b880ba6c0e02fc933737c13f82f SHA1 672aa8b5a94411389dcdbb0f12209c65c949706b SHA256 005d09049b744bda5247f650bc36639c659e87b6f97f1412f0828ac0a3e8a8f7
-EBUILD qt-creator-2.3.0_beta.ebuild 3918 RMD160 f5ca80672cf8e179faec819e5f6097f2d830f39f SHA1 6882427229bd141a827430e9c24001ddb5290ca6 SHA256 a71f3c06ec466baf66360d5b79a7ff07ed848120133e9fff5e3565de3124a704
-MISC ChangeLog 13621 RMD160 c6ae28a2b31df271f7554bbc897342403c24b0ad SHA1 43a0a713cf7f6123f59ae08a99c1362c1163ff4a SHA256 b305551cd56cef41ba39ad933533ff6ed62225351d883286618fa8395c1dbd6f
+EBUILD qt-creator-2.3.0.ebuild 4169 RMD160 a144421f85e1aa0fa51094da69fbbc6db9975d53 SHA1 746ca8b8a5972dc6d676b9dd6d093c951056a3ae SHA256 13469831ac43199d9703bd09e6b5b6cd38b949e28d6140763b1ba322c5438f9a
+MISC ChangeLog 13792 RMD160 d302520fcbd8c7ad4b2b62266a66e867032aa37c SHA1 befca30aff95436b7d156afb74dda4acc55c4821 SHA256 e4bb57624612785b85dbffa416576175daec80589c176933a763e684c847a022
 MISC metadata.xml 1055 RMD160 2558de2f781c71d62f3bab0b834061b387c53268 SHA1 910e7b7e9dd15d58466ed8b03df9a3517ebd29fe SHA256 3f5113d61793395503ae99bc78f22da14f012471bda3f99ac9c3d56c33a6800b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5Qe8sACgkQuUQtlDBCeQLWBgCeLOGLo7NML0QLH5JRWRd+hseS
-fiQAn0GJfAhSo6JxFe1GRzCRBfAD9SD1
-=UG6G
+iQIcBAEBCgAGBQJOaNFaAAoJEPqDWhW0r/LCs6YP/i/1EUkwEORGKKyIjFwmRudE
+RSn3GvFCQSHq7b9EjFYJb3uXtTujgG7OXJrHLOXn/VEoikN7tGoUlpOekyqCrKYS
+77WMpzyRdkihgsS50kX17xgbm/1S7ND08ihlmJdA3CLpPNTXsdlpZOrgDQSHpTx+
+B14liT18SQ93QPldv9lZk0HKmPphX/lSNoJ27hMkBKWdakl3OiatpQD6jwLKZ3lf
+TeoszW0lqhcsY/GJYNGPuGp/nzSlRgYXrirn9LnoYB1T1JgZimMUMIkVu50P46Oy
+K/iHoORAhz10WXWgvgc07JZ8sfeV0753QCU/YkBzr1Cfv2THEcDIyWd6DYdcGiZm
+e3VRT5JmGj0rpeA/2J/u5HSdeXqluYwE6lL3XCARHRLkYSat8G67neX+vIRE1WPS
+6KW/i+Z1Gbk037nxz09yg+8nn5G6uIYEDyu2HzzSwQ9LD2XaUZCo8/w8Yv21hl9z
+yar0wJsTnUrtVDwMfMuVvqDG8Ncb/09sYE/W7bUfkLCvo7ZlZ/N5Z98qHrFuJVqN
+29tbZbbqd6snERXeLHte03GxhSbNqb9hUI9GRO/ZSMTSqekW5yEU41IBWrxwAYwS
+dM5uzkQkhOi0RvfJUSfXAwtDQ8KuPnrgGefOiPo4TgHMO7MTSZ17arGr+lyAdTiS
+bXOb7bXe0dHyrEESIEQB
+=FuyY
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.3.0.ebuild
index 30465a54c667..94d5b7473d88 100644
--- a/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.3.0.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/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild,v 1.1 2011/07/18 11:22:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.3.0.ebuild,v 1.1 2011/09/08 14:29:41 hwoarang Exp $
 
 EAPI="4"
 LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bazaar bineditor bookmarks +cmake cvs debug doc examples fakevim git
 	mercurial perforce +qml qtscript rss subversion"
-QTVER="4.7.1:4"
+QTVER="4.7.4:4"
 DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
 	>=x11-libs/qt-sql-${QTVER}
 	>=x11-libs/qt-svg-${QTVER}
@@ -55,6 +55,11 @@ PATCHES=(
 src_prepare() {
 	qt4-r2_src_prepare
 
+	# fix library path for styleplugin
+	sed -i -e "/target.path/s:lib:$(get_libdir):" \
+		"${S}"/src/libs/qtcomponents/styleitem/styleitem.pro \
+		|| die "Failed to fix multilib dir for styleplugin"
+
 	# bug 263087
 	for plugin in ${PLUGINS}; do
 		if ! use ${plugin}; then
@@ -105,16 +110,20 @@ src_configure() {
 
 src_install() {
 	#install wrapper
-	dobin bin/${MY_PN} bin/qtpromaker || die "dobin failed"
+	dobin bin/${MY_PN} bin/qtpromaker
 	if use qml; then
 		# qmlpuppet component. Bug #367383
-		dobin bin/qmlpuppet || die "Failed to install qmlpuppet component"
+		dobin bin/qmlpuppet
 	fi
-	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets
 	if use doc;then
-		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs || die
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs
 	fi
-	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
+
+	# Install missing icon
+	doicon "${S}"/share/qtcreator/templates/wizards/qtcreatorplugin/${MY_PN}_logo_24.png \
+		|| die "failed to install icon"
+	make_desktop_entry ${MY_PN} "Qt Creator" ${MY_PN}_logo_24 \
 		'Qt;Development;IDE' || die
 
 	# install additional translations
@@ -124,7 +133,7 @@ src_install() {
 			if [[ ${x} == ${lang} ]]; then
 				cd "${S}"/share/${MY_PN}/translations
 				lrelease ${MY_PN}_${x}.ts -qm ${MY_PN}_${x}.qm || die
-				doins ${MY_PN}_${x}.qm || die
+				doins ${MY_PN}_${x}.qm
 			fi
 		done
 	done