Don't use the icon absolute path in desktop file (bug 403129). General ebuild cleanup.

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

3 files changed, 63 insertions, 78 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 3a44cb5194a7..bf9a21102d2a 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.121 2012/02/10 00:57:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.122 2012/03/19 16:31:42 pesa Exp $
+
+*qt-assistant-4.8.0-r1 (19 Mar 2012)
+
+  19 Mar 2012; Davide Pesavento <pesa@gentoo.org> +qt-assistant-4.8.0-r1.ebuild,
+  -qt-assistant-4.8.0.ebuild:
+  Don't use the icon absolute path in desktop file (bug 403129). General ebuild
+  cleanup.
 
   10 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt-assistant-4.6.2-r2.ebuild,
   qt-assistant-4.6.2.ebuild, qt-assistant-4.6.3.ebuild:
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 552c12cdef4f..fa1ce7d6bbec 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -18,23 +18,23 @@ EBUILD qt-assistant-4.6.2.ebuild 2552 RMD160 64a53cd1086173f48938ac8b0544c4f1c6c
 EBUILD qt-assistant-4.6.3.ebuild 2773 RMD160 e3d2eb177c7227b1f263da608c14301003b21062 SHA1 eb33b8bc87f7d47fa0fb74d371e71e49f672ffe7 SHA256 a9ca1298bfc0d13386907ef643bd488661ef621535857adce3e160fd24c49aa7
 EBUILD qt-assistant-4.7.2.ebuild 3750 RMD160 4f9256b6bb6dbf28bc2c668ef84d57974a0ebb0c SHA1 023d6d0ec7bfef5cd044c8fd58650ec535ebbc70 SHA256 3c7322b1ce6abd596fd0d780a457feca70c4f8f70091d17f27731dd1da5bf4df
 EBUILD qt-assistant-4.7.4.ebuild 3813 RMD160 0cf83c2e1d0ceee9fe7c6193df009b1a8f008357 SHA1 bfba88d3e2935f0a749439f4fc6109c58183dd3c SHA256 b93bc674d0bfae369453dcb3d009d0cbad63348681917fc322db79b480ac570c
-EBUILD qt-assistant-4.8.0.ebuild 4518 RMD160 c4944cf7c38ce4504d59b93211e213e02190f798 SHA1 358e6b8c5ffb78309f9693e9e56e32528823d34e SHA256 2bc0d0dd3d8bcbdeb55768b2aeeb028f5ce05bf3fd8f8eacbcd54171f76480bd
-MISC ChangeLog 16377 RMD160 c788a6354a5fe71ecb79566bbdb65b752e1947b2 SHA1 c61cc3eb6694b6311a2d20c9dce2fa655e492cb7 SHA256 48b8d78ea22347b704a137a3a6d32410ce93925697e0880177b085443786bb02
+EBUILD qt-assistant-4.8.0-r1.ebuild 3502 RMD160 6fab184e50f619e17f512bd8c0c706bfc8a02718 SHA1 4bdc701e75448801f488bd1e4d3e2032f2c586fb SHA256 15f5bb11cfcdbc799f44d3f2867704bbe59d7047084fc0b4bded8376cd213bab
+MISC ChangeLog 16618 RMD160 77656a57e57fe8f929ed54bcef882e764cdd86f4 SHA1 d9c8e7a60bc566477b48b67411317c63510b8fb0 SHA256 ee86d6ba5fb0c63ac1fd378a065b89b813e5705b1c9f6d20184dabe71012ab6f
 MISC metadata.xml 1086 RMD160 ce6419ab9a7df55e05adca6403a728735e874524 SHA1 775beea724b2823361bc01c0b5569c6c24fc5cbf SHA256 72d77a6228a9010378d4f9eae1cbc0730d5c38e03754906a95d895947d5d574f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPNGt4AAoJENXLsxwXqFxy4acP/02Mtza1RNohH5XvqWZGcEGr
-/8JHjFELnIx+40eLTpvSbbJwUlFXZL20YeYd7Z0Ty5heX39qLbKCUv7BjakhlN1b
-4/1dNATVj69/5f6l6lmn3Av/BA1VOCxq/jikJ1XW8QMZhuturm6z7oclBP92Xguh
-xRVQcWeHixBidhsCJF0b9G1hypyluBOjmoRNaGrnQ75MXXFe/5XuxBf3duhslqpO
-Pe8BAjPH5NB1jIEbV7FEQE1ycRvk3XIS+RjCIT8pvUwkzjn1aJvrFzsO87hL7Wt2
-AN9A/vceKok1z6P1z2UYQ+uEZauFDsEEkwjbpVToEwRJfII3z6Yos2nGXorCrrdO
-eQmTN726NeuG3W9uZmBdqZlRIPcdlEdEnaAdBay0DLGBWb2/fRkUGu/nLW/5U72f
-7zwfBGWcRSeZeFNbQQf5KMXZABM2IgQps2pfQ67hwSmVnuQOesJiK90uctc7zFEz
-vNVhY6LzcwoSw1QdA5VKM9FuLJhctCo2jgR79JPTZ51afc7SeHhS1K+7c7O7PgcU
-2/pQ+y3CGiB6D8f5o7VP9lr6gWNC8Af1oQOWNrI+mNM5ZHFlz0eWbhX59IovdqgO
-ELdQxGBwKI2aJHOk2H4arCKIGAtFjeamR7qYfzS4GjU1DuxnNo7B4p46JF5TsSKR
-WeKBrzYU6vpNhvlI3JX1
-=5iEq
+iQIcBAEBCgAGBQJPZ19zAAoJENXLsxwXqFxy1vYQAJ483t8viV7l4LHiE33AGwK/
+DDWVrK9RXNYyhFvEvKmiUi+It1AcSfIwj7MQdpbHZDKsWI3ebmcnHZM4UFGv9Y7e
+LSXEUUay1STAn6P+YFNKsaDU2BX/yF8zgPXOquP7OCJfwB3YKGe5BaDqGZR15aHU
+EAlS53XvbfJQ5/cYEMXsRB1if6TkjXFgaWn6dt8gOaMROQ+V+2KcyVaptRwEG+9Q
+WMYLj38i1Zbe6d5bX4BF69Ym7kOBs3b0Jr3AiENckR05Wxf12xCVHl2+uPUWbKfg
+p44i93DmdhU3Pbd4KejOtmb8a4Y9W1FrPk6mHiGNxriO43onTV5+rBy7urLMzSE4
+BeTtDaPAWouk8IlU69BhdKryhFi3I2vAX94I17PrGLFN1McW985PiA8Z2MzWOtmv
+gd0CRrVJY3aCD/UZ6iI6eC0cdBrmoEhg6PCMOcisTNt6bo4x00N9jgXjgc49w8NZ
++DQEw6IEdCSsmP3/Bjz2KntPVwYM5FA96WX1EVS9ctEFp4LQjUVm2WM+EG/XWvOG
+VWDfMoEKXkpsaRLS7dfwaHKuS7nVIXrgB3XnjY13xcpLRl5d8s1dn0504V9trhuy
+zKZ794djMDMw8EkvBOW53wUyQfZIzS0rc4Pa5cWDnn1LRuDe0Hv+5C6nKRLItFdz
+OcfbtES+loG36+VdgctN
+=1Hm0
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.0-r1.ebuild
index 583e631b6ef7..35df3844613b 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.0-r1.ebuild
@@ -1,22 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild,v 1.2 2012/02/10 00:51:18 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.0-r1.ebuild,v 1.1 2012/03/19 16:31:42 pesa Exp $
 
 EAPI="3"
-if [[ ${PV} == 4*9999 ]]; then
-	ECLASS="-edge"
-fi
-inherit qt4-build${ECLASS}
 
-DESCRIPTION="The assistant help module for the Qt toolkit"
+inherit qt4-build
+
+DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
+SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-else
-	KEYWORDS=""
-fi
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="compat doc +glib qt3support trace webkit"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
 
 DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?]
 	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=,sqlite]
@@ -30,31 +25,29 @@ PATCHES=(
 
 pkg_setup() {
 	# Pixeltool isn't really assistant related, but it relies on
-	# the assistant libraries. doc/qch/
+	# the assistant libraries.
 	QT4_TARGET_DIRECTORIES="
 		tools/assistant
 		tools/pixeltool
 		tools/qdoc3"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="
-			tools/
-			demos/
-			examples/
-			src/
-			include/
-			doc/"
-	fi
+	QT4_EXTRACT_DIRECTORIES="
+		tools
+		demos
+		examples
+		src
+		include
+		doc"
+
+	use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
 
-	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		tools/qttracereplay"
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		${QT4_EXTRACT_DIRECTORIES}"
 
-	qt4-build${ECLASS}_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_unpack() {
-	qt4-build${ECLASS}_src_unpack
+	qt4-build_src_unpack
 	# compat version
 	# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
 	if use compat; then
@@ -68,7 +61,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	qt4-build${ECLASS}_src_prepare
+	qt4-build_src_prepare
 
 	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
 
@@ -80,16 +73,17 @@ src_prepare() {
 }
 
 src_configure() {
-	myconf="${myconf} -no-xkb -no-fontconfig -no-xrandr
+	myconf+="
+		-no-xkb -no-fontconfig -no-xrandr
 		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
 		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
 		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
 		-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
 		-no-fontconfig -no-multimedia -no-svg
 		$(qt_use qt3support) $(qt_use webkit)"
-	! use glib && myconf="${myconf} -no-glib"
+	use glib || myconf+=" -no-glib"
 
-	qt4-build${ECLASS}_src_configure
+	qt4-build_src_configure
 }
 
 src_compile() {
@@ -97,51 +91,35 @@ src_compile() {
 	export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
 	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
 
-	qt4-build${ECLASS}_src_compile
+	qt4-build_src_compile
 
-	# ugly hack to build docs
 	cd "${S}"
+	# ugly hack to build docs
 	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-	# live ebuild cannot build qch_docs. It will build them through emake docs
-	if [[ ${PV} != 4*9999 ]]; then
-		emake qch_docs || die "emake qch_docs failed "
-	fi
+	emake qch_docs || die "emake qch_docs failed"
+
 	if use doc; then
 		emake docs || die "emake docs failed"
 	fi
-	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
 }
 
 src_install() {
-	qt4-build${ECLASS}_src_install
+	qt4-build_src_install
+
 	cd "${S}"
-	#see src_compile note
-	if [[ ${PV} != 4*9999 ]]; then
-		emake INSTALL_ROOT="${D}" install_qchdocs \
-		|| die "failed to install qch docs"
-	fi
+	emake INSTALL_ROOT="${D}" install_qchdocs || die "failed to install qch docs"
+
 	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs \
-			|| die "failed to install htmldocs"
-		# Now it is time for the live ebuild to install the qch docs
-		if [[ ${PV} == 4*9999 ]]; then
-			emake INSTALL_ROOT="${D}" install_qchdocs \
-				|| die "failed to install qch docs"
-		fi
+		emake INSTALL_ROOT="${D}" install_htmldocs || die "failed to install html docs"
 	fi
-	dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
-	# install correct assistant icon, bug 241208
-	dodir /usr/share/pixmaps/ || die "dodir failed"
-	insinto /usr/share/pixmaps/
-	doins tools/assistant/tools/assistant/images/assistant.png ||
-		die "doins failed"
-	# Note: absolute image path required here!
-	make_desktop_entry assistant Assistant \
-		"${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \
-			|| die "make_desktop_entry failed"
+
+	dobin "${S}"/bin/qdoc3 || die
+
+	doicon tools/assistant/tools/assistant/images/assistant.png || die
+	make_desktop_entry assistant Assistant assistant 'Qt;Development'
 
 	if use compat; then
-		insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
-		doins tools/assistant/compat/features/assistant.prf || die "doins failed"
+		insinto /usr/share/qt4/mkspecs/features
+		doins tools/assistant/compat/features/assistant.prf || die
 	fi
 }