Fixing qt's moc detection (Bug #38966). Fixed DEPENDs to match libmustux version. Added automake/autoconf deps.

5 files changed, 48 insertions, 20 deletions

diff --git a/media-sound/protux/ChangeLog b/media-sound/protux/ChangeLog
index c141351ecb15..d18a32ff7ab1 100644
--- a/media-sound/protux/ChangeLog
+++ b/media-sound/protux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/protux
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.4 2003/12/20 17:24:32 mholzer Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.5 2004/02/09 18:58:06 eradicator Exp $
+
+  09 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> protux-0.16.0.ebuild,
+  protux-0.17.8.ebuild, protux-0.20.0.ebuild:
+  Fixing qt's moc detection (Bug #38966). Fixed DEPENDs to match libmustux
+  version.  Added automake/autoconf deps.
 
 *protux-0.20.0 (20 Dec 2003)
 
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
index 2e27dfd56fe0..e09dbf76ee81 100644
--- a/media-sound/protux/Manifest
+++ b/media-sound/protux/Manifest
@@ -1,8 +1,8 @@
-MD5 d3b90433a47c64cbbf626495cd125fbb ChangeLog 737
-MD5 54bff3b89aefe612a2955de1cf13b635 protux-0.16.0.ebuild 708
-MD5 cae649f8b6a96bfdc4048f11e3bd412e protux-0.17.8.ebuild 709
+MD5 4b193ef9d51e453c8abdc622623bf678 protux-0.16.0.ebuild 889
+MD5 6eec514803162a7a7d3426e8a9eab603 protux-0.17.8.ebuild 890
+MD5 b7f59d99b92d4f791778bec2f77c4d54 protux-0.20.0.ebuild 877
+MD5 6aa2fdb850dad3d37543428b3098a500 ChangeLog 983
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
-MD5 7ad4e4c755fd27815c720a392fcc92bc protux-0.20.0.ebuild 827
 MD5 e2dd10b4d2a0c95521fdf87252684258 files/digest-protux-0.16.0 65
 MD5 8f21b8a7e61479e2c48c22ffa7de96e2 files/digest-protux-0.17.8 65
 MD5 b705aa6b0a2ea796649316d5378f9642 files/digest-protux-0.20.0 65
diff --git a/media-sound/protux/protux-0.16.0.ebuild b/media-sound/protux/protux-0.16.0.ebuild
index 1304ab0dad1d..e7255c575208 100644
--- a/media-sound/protux/protux-0.16.0.ebuild
+++ b/media-sound/protux/protux-0.16.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.16.0.ebuild,v 1.5 2003/09/11 01:21:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.16.0.ebuild,v 1.6 2004/02/09 18:58:06 eradicator Exp $
+
+inherit kde-functions
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://www.nongnu.org/protux"
@@ -12,13 +14,21 @@ KEYWORDS="x86"
 
 S="${WORKDIR}/${P}"
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	>=x11-libs/qt-3
-	>=media-libs/libmustux-0.16.0"
+	=media-libs/libmustux-0.16*"
 
-src_compile() {
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/autoconf"
 
+set-qtdir 3
+
+src_compile() {
+	export QT_MOC=${QTDIR}/bin/moc
 	cd ${S}
+	export WANT_AUTOMAKE=1.4
+	export WANT_AUTOCONF=2.1
 	make -f admin/Makefile.common
 	econf
 	emake || die
diff --git a/media-sound/protux/protux-0.17.8.ebuild b/media-sound/protux/protux-0.17.8.ebuild
index 0e679c11ed6b..e35bf94f701b 100644
--- a/media-sound/protux/protux-0.17.8.ebuild
+++ b/media-sound/protux/protux-0.17.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.17.8.ebuild,v 1.3 2003/09/11 01:21:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.17.8.ebuild,v 1.4 2004/02/09 18:58:06 eradicator Exp $
+
+inherit kde-functions
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://www.nongnu.org/protux"
@@ -12,13 +14,21 @@ KEYWORDS="~x86"
 
 S="${WORKDIR}/${P}"
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	>=x11-libs/qt-3
-	>=media-libs/libmustux-0.17.5"
+	=media-libs/libmustux-0.17*"
 
-src_compile() {
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/autoconf"
 
+set-qtdir 3
+
+src_compile() {
+	export QT_MOC=${QTDIR}/bin/moc
 	cd ${S}
+	export WANT_AUTOMAKE=1.4
+	export WANT_AUTOCONF=2.1
 	make -f admin/Makefile.common
 	econf
 	emake || die
diff --git a/media-sound/protux/protux-0.20.0.ebuild b/media-sound/protux/protux-0.20.0.ebuild
index ccd7ae6aaa93..d54b509f5a70 100644
--- a/media-sound/protux/protux-0.20.0.ebuild
+++ b/media-sound/protux/protux-0.20.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.0.ebuild,v 1.1 2003/12/20 17:24:32 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.0.ebuild,v 1.2 2004/02/09 18:58:06 eradicator Exp $
+
+inherit kde-functions
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://www.nongnu.org/protux"
@@ -15,11 +17,12 @@ S="${WORKDIR}/${P}"
 
 DEPEND="virtual/x11
 	>=x11-libs/qt-3
-	>=media-libs/libmustux-0.20.0"
+	=media-libs/libmustux-0.20*"
 
-RDEPEND=${DEPEND}
+set-qtdir 3
 
 src_compile() {
+	export QT_MOC=${QTDIR}/bin/moc
 	local myconf
 	myconf="--with-gnu-ld"
 	use static || myconf="${myconf} --enable-static=no"