Fix installation of qch files (bug #408129) and cleanup usage of prefix variables. Remove old.

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

4 files changed, 45 insertions, 172 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 7344d938deb5..2001b294a5b8 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.108 2012/02/02 22:16:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.109 2012/03/15 21:04:59 pesa Exp $
+
+  15 Mar 2012; Davide Pesavento <pesa@gentoo.org> -qt-creator-2.4.0-r1.ebuild,
+  qt-creator-2.4.1.ebuild:
+  Fix installation of qch files (bug #408129) and cleanup usage of prefix
+  variables. Remove old.
 
 *qt-creator-2.4.1 (02 Feb 2012)
 
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index a10d49539521..66d9dda8f39b 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -4,28 +4,26 @@ Hash: SHA512
 AUX qt-creator-2.1.0_rc1-qml-plugin.patch 724 RMD160 f9eff709b1585ad0264b5855b477f2a703c3e232 SHA1 2f84e0f3d32e4efb4328fdef484bc0a7af552ed3 SHA256 78c9f628b6f167cc80317d328a327c106e2dbcc2b3141c7beace9ffc4b30d0af
 DIST qt-creator-2.1.0-src.zip 28181645 RMD160 16fdf6f03ab8ea6a567f4cd1cb58580772a9627b SHA1 f1d7abf92df7a9ba53eb9006ca189ac7203c0e9f SHA256 a68d80f158b5e0a0faffd1a9fe7ef8afda545a970557572f5a192ecd9db0b85a
 DIST qt-creator-2.3.1-src.tar.gz 26820259 RMD160 06cdd661954a72125a5a6a7c75a293338c2df6c4 SHA1 620fe944994fffe0812a1474deff78e07b34025b SHA256 e9d25f5d8d489b44300a68f446ad30d2f9259f1d27c7e8e1ac7bb145772d481a
-DIST qt-creator-2.4.0-src.tar.gz 26105130 RMD160 c8be1e24e100b856a8f78b52848ad7053e7fa366 SHA1 12934e34fdda3f493812e671f8db1fb789578e91 SHA256 3d83013d9d6842f1dfe4d345dd837b83855c8686035b9fe55aec2a0ecb901af0
 DIST qt-creator-2.4.1-src.tar.gz 26234171 RMD160 2caf8db7a1e5bb1a41fe282d6d20806d57d4c8c1 SHA1 a6b5dc13722b19a34e6b8e4c7eb14b0715e9f6ba SHA256 d72ad2dd9584933595fd987dfb4ec476c776743a587c493bd2eff2aaafb38897
 EBUILD qt-creator-2.1.0.ebuild 4366 RMD160 7bb6643a50343ba236fff12a4c43a44ab109a317 SHA1 bfe69de1ae21e45ec2144a8ea75a558aa34fbe26 SHA256 9e07242bfddf41eb585118cefb41650c8b18d34378c7be263e775acfa50cf70f
 EBUILD qt-creator-2.3.1.ebuild 5412 RMD160 6e3b8aa2202fc12906ae719b32ab0d2d4b6a7511 SHA1 84b44670fa726265229afab3cdadd6d68190bbfb SHA256 beaad6d1aa7b9f2a1e3895960568153894def2f7dc62e0bc524af0e152f31073
-EBUILD qt-creator-2.4.0-r1.ebuild 4084 RMD160 8d80fab15507ccf0d580873e8f5fbcfda2633fe6 SHA1 7d05d6ef74e6cbbe8ce0385232386967d02fcee0 SHA256 84860b91c13f704f60e8ace3ecf6a79eae81365a03c0e4e2f3284ba76d46afdf
-EBUILD qt-creator-2.4.1.ebuild 4081 RMD160 5f5980490f50473903845df7dde3edc1ba78a073 SHA1 e97e653659a1613668dc2469311a9525d9d94af3 SHA256 983973108e83867635c6fb0f8083467b49be6ecfb5c20ad9b2be2c4d5ec228d2
-MISC ChangeLog 17268 RMD160 255b61b498d0be8711b9855d5b50ebeb5413d5ef SHA1 1656841d7786ab19b9641a545ecba025ee42ea38 SHA256 3f96477b37dd718297330b7df469cad669901af9ac2e18aa81104678147ca9e5
+EBUILD qt-creator-2.4.1.ebuild 4092 RMD160 1464e870551d3f3ddb5b76c24bb2f89e5641d206 SHA1 1a2f7e5a8cba0c4b60f2db6d508efe3fb7cc7494 SHA256 c73196dc16fd9cc2104d5cf79ed7f68476f3b406b3a186928d4b10ff92b6e80c
+MISC ChangeLog 17470 RMD160 9150748320062ef951fc470a7601c9f3ab007ae8 SHA1 cf443391cda1e5dc3ec3c921bc46d98996f2a546 SHA256 4cd30e6424203f830438afbe2e046ff084fb29d685c9562a4d89fea42015d2f0
 MISC metadata.xml 1463 RMD160 b8a89ed65e589882eb76b2b6121af00ce418759c SHA1 ccbec1b219fbf78e1d788d05fdc278b98581d080 SHA256 3025ff87f1d0ce4cee9dd0710c10f5c6df1b68e8784a5562884ac0aef5dc045d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPKws3AAoJEPqDWhW0r/LC9oUP/jMiHFds7VePR3PK5GQG4Nxk
-I5Ol2Y45WdL0vQ2jK8lVSyqtRi9gATJrOgwkhReutkWOXmAoFCEXOdQIjHT1Ff/J
-MaHU7wBERGvuBKLmx+rO0ccDfeWaf81P+SDHC6HGoYUTyPUAN2qmWzpazn84jaYz
-DwKd77ZqQ82eZTc0ngSmUuzEZ0riIZAq2XJi7wmU+O8TytdKXuFh9JC9v/fjEPy5
-naJVapqdYh2bOa8p2gUTbcTNDp9Rw5pqMYOGyZxGvOr54HoHVj7EXIeXhg+BwyOc
-nMCfwCgmCVCay+HTJ3Iemt7ATX1+A/ABQNcxG5SdJb1u9T4mINGzjQXCD9Y3Bx2v
-KbLwPv34/GWRO0oVuLcr0OsxQ+UyROZL+f9unSt+KqlO6uds8E2K2jJCC3qEdWsl
-UGllng+AerLDrrIuf5io6eFpMh63TkZr15VrRWeSk/WAV8iAsUmTkjU8pJBbNfAi
-DQrCscnP7znZbH+o8bRmKYY7dJjtBWqQZz4yCuwyvcwwVb2QPd74vo0AwvGs1ytw
-zOSo3WzNMJGQZaX84mvDIqY6sJBzlJap/bafdkKSOA8gmFJRCGIALMBnYJLay9Jg
-VaoNOVQHUEnezBlbxItcYNWWYu90742c0UR/p22qGql4nV1vdd7NzdTQxba+r+UL
-peRgqyZ8kc0akB1JJHcg
-=/lXQ
+iQIcBAEBCgAGBQJPYlmOAAoJENXLsxwXqFxyM5oQAKzG9DsqdNFua+tIpUiC+bj/
+Sn+oE89kyVpeiPSnZCzI6COrUfjShnHvPQfMPotrA6e1CGv7kMJ8giyzXnB7wSaJ
+oJKEg1joa1E1S2CPBgoT5tUqDVpXGYjV3SbePrSSxSAb2KgWU5MryOHp7PetHDj+
+ZtaOg0ORCWwhOHP/QOV6sMlzVcXYa0H0GMEXMDzx1iGZlC4bG5WR08S10v3KDFKw
+1d7Nm21Fz5sTQHme21Mg2/6IO8YsWoF5cEA79OrsmScVfmnCD1cOIgLQFsrbzLGq
+MyYmsdi/QxxYRP32LQZ7wY/ocq1A9mDSzKhpEXJcpPthD7Jtu6nBEodet2K+Qpw8
+DjlLnTbC6J4hFh2OXKi20l73USrytgI7U/4zE0ZiLwy7f4ifJ05vD4bT+jGTlVvj
+Br2igAHWJ/kvJSpFW1QAyMkm8QmMMBdyLPc4UB43MgNxZmhiJKgVyZ58RkAdHSw7
+IpgbqQC62SU2Z7mwRNJUrzngdg/DoczGwAlkFh7cTgNqGFHzYPqRGISe6A3V7lUF
+AcbFKs+4wVFB2dVKvrq1yFrSYJIzzKkPVgeJYGwF7hohmuYJAI2DJ/U2wAN9Z+86
+zzheliqgEM3zvJRAGCJXwy687OSoPoqtn9l1JPm1RALsuSxOGrxbQYERg+d+9cGF
+qWJ1a6puEEKEGA9xJ5sK
+=Ev9U
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild b/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild
deleted file mode 100644
index bb662a24bd66..000000000000
--- a/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 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.4.0-r1.ebuild,v 1.3 2012/01/15 22:02:31 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
-
-inherit multilib eutils flag-o-matic qt4-r2
-
-MY_P=${PN}-${PV/_/-}-src
-
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt.nokia.com/products/developer-tools"
-SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-QTC_PLUGINS=(bazaar cmake:cmakeprojectmanager cvs fakevim
-	git madde mercurial perforce subversion valgrind)
-IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
-
-QTVER="4.7.4:4"
-CDEPEND="
-	>=x11-libs/qt-core-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-declarative-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-gui-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-script-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-sql-${QTVER}
-	>=x11-libs/qt-svg-${QTVER}
-	debug? ( >=x11-libs/qt-test-${QTVER} )
-	>=x11-libs/qt-assistant-${QTVER}[doc?]
-	!botan-bundled? ( =dev-libs/botan-1.8* )
-"
-DEPEND="${CDEPEND}
-	!botan-bundled? ( dev-util/pkgconfig )
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[python]
-	examples? ( >=x11-libs/qt-demo-${QTVER} )
-"
-PDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -e "/^[[:space:]]\+plugin_${plugin#*:}/d" src/plugins/plugins.pro \
-				|| die "failed to disable ${plugin} plugin"
-		fi
-	done
-
-	if use perforce; then
-		ewarn
-		ewarn "You have enabled the perforce plugin."
-		ewarn "In order to use it, you need to manually download the perforce client from"
-		ewarn "  http://www.perforce.com/perforce/downloads/index.html"
-		ewarn
-	fi
-
-	# fix translations
-	sed -i -e "/^LANGUAGES/s:=.*:= ${LANGS}:" \
-		share/qtcreator/translations/translations.pro || die
-
-	if ! use botan-bundled; then
-		# identify system botan and pkg-config file
-		local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | \
-			cut -d '.' -f1,2)
-		local lib_botan=$(pkg-config --libs botan-${botan_version})
-		einfo "Major version of system's botan library to be used: ${botan_version}"
-
-		# drop bundled libBotan. Bug #383033
-		rm -rf "${S}"/src/libs/3rdparty/botan || die
-		# remove references to bundled botan
-		sed -i -e "s:botan::" "${S}"/src/libs/3rdparty/3rdparty.pro || die
-		for x in testrunner parsertests modeldemo; do
-			sed -i -e "/botan.pri/d" "${S}"/tests/valgrind/memcheck/${x}.pro || die
-		done
-		sed -i -e "/botan.pri/d" "${S}"/src/libs/utils/utils_dependencies.pri || die
-		sed -i -e "/botan.pri/d" "${S}"/tests/manual/preprocessor/preprocessor.pro || die
-		# link to system botan
-		sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/qtcreator.pri || die
-		sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die
-		# append botan refs to compiler flags
-		append-flags $(pkg-config --cflags --libs botan-${botan_version})
-	fi
-}
-
-src_configure() {
-	eqmake4 qtcreator.pro \
-		IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=true
-}
-
-src_compile() {
-	emake
-	use doc && emake docs
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install
-
-	if use doc; then
-		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_docs
-	fi
-
-	# Install icon & desktop file
-	doicon src/plugins/coreplugin/images/logo/128/qtcreator.png || die
-	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE' || die
-
-	# Remove unneeded translations
-	local lang
-	for lang in ${LANGS}; do
-		if ! has ${lang} ${LINGUAS}; then
-			rm "${D}"/usr/share/qtcreator/translations/qtcreator_${lang}.qm \
-				|| eqawarn "failed to remove ${lang} translation"
-		fi
-	done
-}
diff --git a/dev-util/qt-creator/qt-creator-2.4.1.ebuild b/dev-util/qt-creator/qt-creator-2.4.1.ebuild
index 37f3798112bd..18b3e0ffb0f6 100644
--- a/dev-util/qt-creator/qt-creator-2.4.1.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.4.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 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.4.1.ebuild,v 1.1 2012/02/02 22:16:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.1.ebuild,v 1.2 2012/03/15 21:04:59 pesa Exp $
+
+EAPI=4
 
-EAPI="4"
 LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
 
 inherit multilib eutils flag-o-matic qt4-r2
@@ -21,16 +22,17 @@ QTC_PLUGINS=(bazaar cmake:cmakeprojectmanager cvs fakevim
 	git madde mercurial perforce subversion valgrind)
 IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
 
-QTVER="4.7.4:4"
+QT_PV="4.7.4:4"
+
 CDEPEND="
-	>=x11-libs/qt-core-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-declarative-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-gui-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-script-${QTVER}[private-headers(+)]
-	>=x11-libs/qt-sql-${QTVER}
-	>=x11-libs/qt-svg-${QTVER}
-	debug? ( >=x11-libs/qt-test-${QTVER} )
-	>=x11-libs/qt-assistant-${QTVER}[doc?]
+	>=x11-libs/qt-assistant-${QT_PV}[doc?]
+	>=x11-libs/qt-core-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-declarative-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-gui-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-script-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-sql-${QT_PV}
+	>=x11-libs/qt-svg-${QT_PV}
+	debug? ( >=x11-libs/qt-test-${QT_PV} )
 	!botan-bundled? ( =dev-libs/botan-1.8* )
 "
 DEPEND="${CDEPEND}
@@ -38,7 +40,7 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[python]
-	examples? ( >=x11-libs/qt-demo-${QTVER} )
+	examples? ( >=x11-libs/qt-demo-${QT_PV} )
 "
 PDEPEND="
 	bazaar? ( dev-vcs/bzr )
@@ -65,11 +67,11 @@ src_prepare() {
 	done
 
 	if use perforce; then
-		ewarn
+		echo
 		ewarn "You have enabled the perforce plugin."
 		ewarn "In order to use it, you need to manually download the perforce client from"
 		ewarn "  http://www.perforce.com/perforce/downloads/index.html"
-		ewarn
+		echo
 	fi
 
 	# fix translations
@@ -78,8 +80,7 @@ src_prepare() {
 
 	if ! use botan-bundled; then
 		# identify system botan and pkg-config file
-		local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | \
-			cut -d '.' -f1,2)
+		local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2)
 		local lib_botan=$(pkg-config --libs botan-${botan_version})
 		einfo "Major version of system's botan library to be used: ${botan_version}"
 
@@ -112,21 +113,23 @@ src_compile() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install
+	emake INSTALL_ROOT="${ED}usr" install
 
+	# Install documentation
 	if use doc; then
-		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_docs
+		insinto /usr/share/doc/${PF}
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
 
 	# Install icon & desktop file
-	doicon src/plugins/coreplugin/images/logo/128/qtcreator.png || die
-	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE' || die
+	doicon src/plugins/coreplugin/images/logo/128/qtcreator.png
+	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE'
 
 	# Remove unneeded translations
 	local lang
 	for lang in ${LANGS}; do
 		if ! has ${lang} ${LINGUAS}; then
-			rm "${D}"/usr/share/qtcreator/translations/qtcreator_${lang}.qm \
+			rm "${ED}"usr/share/qtcreator/translations/qtcreator_${lang}.qm \
 				|| eqawarn "failed to remove ${lang} translation"
 		fi
 	done