QA: Obey the multilib, do not nedlessly die, etc, etc.

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

4 files changed, 27 insertions, 61 deletions

diff --git a/media-libs/herqq/ChangeLog b/media-libs/herqq/ChangeLog
index 087706de1476..16ea23875c04 100644
--- a/media-libs/herqq/ChangeLog
+++ b/media-libs/herqq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/herqq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/ChangeLog,v 1.4 2011/04/28 20:00:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/ChangeLog,v 1.5 2011/04/28 20:25:58 scarabeus Exp $
+
+  28 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -herqq-0.8.0-r1.ebuild,
+  herqq-1.0.0-r1.ebuild:
+  QA: Obey the multilib, do not nedlessly die, etc, etc.
 
 *herqq-1.0.0-r1 (28 Apr 2011)
 *herqq-0.8.0-r1 (28 Apr 2011)
diff --git a/media-libs/herqq/Manifest b/media-libs/herqq/Manifest
index 500277afa042..9dcab65ed9aa 100644
--- a/media-libs/herqq/Manifest
+++ b/media-libs/herqq/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST herqq-0.8.0.zip 1078060 RMD160 62921282ae7313854ff7d80236bbfcfe1e012167 SHA1 3fdf1612048afc71f7dc5ce8e802d10871590e41 SHA256 16de3a7ca86833a65f0438807a297025ccee817cc2bed3f870b14187884b3f7c
 DIST herqq-1.0.0.zip 1070813 RMD160 b0a9725e47b156979469fbad9828620caab160ad SHA1 543a67802c37c66c29c8527522b1630c42756545 SHA256 cbcfc76f72d561d822a7ff5374b97e80d1731b610a5c257edbf5c013bfe6748e
-EBUILD herqq-0.8.0-r1.ebuild 898 RMD160 dcffbb1912851945425206369edf6d1ced707ddd SHA1 70c5656bfd3e576adddc906cbb68f74d32adf4f5 SHA256 f47ea9d24565e87a1970a6a6d25b1871beb9dcf206f300670efe2a24ba8f5e83
-EBUILD herqq-1.0.0-r1.ebuild 898 RMD160 4c09fb085beab0279067d5dff9fcd0c2d088d14b SHA1 de990697f8d3427fce588df71ad35a4ee721bc1b SHA256 2eb7c8f1efa5e6c2c062f956f89dfdb773b7283c3895d39357a597e841619f53
-MISC ChangeLog 859 RMD160 c96b93c1c74a94bf8352dfaf1950b800f30cf90a SHA1 62ccec4dff03520a1e53b74cffa3358be15d9662 SHA256 8b32985310c57e0af3caaac9902bad606697f1e67ea4883a2d1c328ff3d44745
+EBUILD herqq-1.0.0-r1.ebuild 1018 RMD160 828a7dce66ddbac6abd262c79b564c3ab68a3307 SHA1 de7cd3910e1c1bb0e7c6ae9b44cd108cab153938 SHA256 4b6ca4dbd37e140c14833b439064b2d4f95834569a0072d2b3bac3fe4cf544d7
+MISC ChangeLog 1024 RMD160 a9e4fd34a704a416139df091e960b9121e99caa5 SHA1 1226e96570c1f477fafa9c5887e23e656f9ff778 SHA256 fed35501191798d083344a7085c31356560d617c7c78a79066a2753d67a2ffd3
 MISC metadata.xml 259 RMD160 7881ead4a93d655c58d004d15a745b37844cd3e8 SHA1 1c059f83583c6701bb7bba12e5f14512b646a0a6 SHA256 26b68e674ca0146650a581b49a9781e288181b539796d45fc6a4e9e50cda15e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNucdtAAoJEOeBhlrCAAWGE1oH/0xRn9L5ZHc85x5FLc4BrBd5
-lho53qzyvhSJ6VMik+EUcMD8T68FVmUj2ALhooU3nQpNtSeHX00L0jyhcWq9vWgr
-WyuFJxGhVpsfQdvtDCfqTlD6En5Oos8endR9HoGuwlKsqsWdKRpCZ5n5zJ/Co8dE
-XVc+KKVBVWhgWf56tP4pj43WefWV0fH37FPRJBMvXQDEGyk1ysgNcZ411s0mbBl/
-kXGqTeo53UAMZmStmxGnanFnoM95f5u9nWlFhqJ3Xrl0QqJ3kd0uLp+hX9ITUlXB
-wVriq3Pw+dg8YCXR5psmX/JaIItyc/v213S6+qspZaQxihJ1nfJjMbzuDVExP9s=
-=XKC7
+iEYEARECAAYFAk25zSwACgkQHB6c3gNBRYe5FwCeLxhijpZu9nHZdvdi7GshOv5f
+72IAoMusuE2SayTUcVrVIrQ8PqthYq0W
+=fqDH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/herqq/herqq-0.8.0-r1.ebuild b/media-libs/herqq/herqq-0.8.0-r1.ebuild
deleted file mode 100644
index 76a4437c5746..000000000000
--- a/media-libs/herqq/herqq-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-0.8.0-r1.ebuild,v 1.1 2011/04/28 20:00:37 ottxor Exp $
-
-EAPI="3"
-
-inherit base multilib qt4-r2
-
-DESCRIPTION="A software library for building UPnP devices"
-HOMEPAGE="http://www.herqq.org"
-SRC_URI="mirror://sourceforge/hupnp/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-#no release of QtSolutions using bundled libQtSolutions_SOAP
-RDEPEND="x11-libs/qt-core"
-DEPEND="${RDEPEND}"
-
-DOCS=( hupnp/ChangeLog )
-HTML_DOCS=( hupnp/docs/html/ )
-
-src_prepare() {
-	find . -name "*.pro" -exec sed -i "s@PREFIX/lib@PREFIX/$(get_libdir)@" {} \; || die
-}
-
-src_configure() {
-	eqmake4 herqq.pro PREFIX="${EPREFIX}/usr" || die
-}
-
-src_install() {
-	qt4-r2_src_install || die
-	if use doc; then
-		base_src_install_docs || die
-	fi
-}
diff --git a/media-libs/herqq/herqq-1.0.0-r1.ebuild b/media-libs/herqq/herqq-1.0.0-r1.ebuild
index 03224eb60a05..fb702454e2f4 100644
--- a/media-libs/herqq/herqq-1.0.0-r1.ebuild
+++ b/media-libs/herqq/herqq-1.0.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild,v 1.1 2011/04/28 20:00:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild,v 1.2 2011/04/28 20:25:58 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit base multilib qt4-r2
+inherit multilib base qt4-r2
 
 DESCRIPTION="A software library for building UPnP devices"
 HOMEPAGE="http://www.herqq.org"
@@ -15,24 +15,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-#no release of QtSolutions using bundled libQtSolutions_SOAP
-RDEPEND="x11-libs/qt-core"
+# no release of QtSolutions using bundled libQtSolutions_SOAP
+RDEPEND="
+	x11-libs/qt-core:4
+	x11-libs/qt-xmlpatterns:4
+"
 DEPEND="${RDEPEND}"
 
 DOCS=( hupnp/ChangeLog )
 HTML_DOCS=( hupnp/docs/html/ )
 
 src_prepare() {
-	find . -name "*.pro" -exec sed -i "s@PREFIX/lib@PREFIX/$(get_libdir)@" {} \; || die
+	# fix the .pro file for multilib issues
+	sed \
+		-e "s:PREFIX/lib:PREFIX/$(get_libdir):" \
+		-i "${S}/hupnp/src.pro" \
+		-i "${S}/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro" || die
+	qt4-r2_src_prepare
 }
 
 src_configure() {
-	eqmake4 herqq.pro PREFIX="${EPREFIX}/usr" || die
+	eqmake4 PREFIX="${EPREFIX}/usr/"
 }
 
 src_install() {
-	qt4-r2_src_install || die
-	if use doc; then
-		base_src_install_docs || die
-	fi
+	qt4-r2_src_install
+	use doc && base_src_install_docs
 }