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

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 22 insertions, 50 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/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
 }