Fixing qt's moc detection (Bug #38966).

5 files changed, 28 insertions, 13 deletions

diff --git a/media-libs/libmustux/ChangeLog b/media-libs/libmustux/ChangeLog
index f7b9660e05e8..e232fc7ba051 100644
--- a/media-libs/libmustux/ChangeLog
+++ b/media-libs/libmustux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmustux
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/ChangeLog,v 1.4 2004/02/01 12:47:54 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/ChangeLog,v 1.5 2004/02/09 12:24:33 eradicator Exp $
+
+  09 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libmustux-0.16.0.ebuild, libmustux-0.17.5.ebuild, libmustux-0.20.0.ebuild:
+  Fixing qt's moc detection (Bug #38966).
 
   01 Feb 2004; Brian Harring <ferringb@gentoo.org> libmustux-0.16.0.ebuild,
   files/libmustux-0.16.0-alsalib-fix.patch:
diff --git a/media-libs/libmustux/Manifest b/media-libs/libmustux/Manifest
index 9a2a296ee6cf..0a4e2c3e1bf4 100644
--- a/media-libs/libmustux/Manifest
+++ b/media-libs/libmustux/Manifest
@@ -1,9 +1,9 @@
-MD5 07760a4c8a6414dd12ffabe553699577 libmustux-0.16.0.ebuild 800
-MD5 e2fa49512d81e1b09cbb1a0f8b3ae41a ChangeLog 835
-MD5 f4f8ab485e69285e80b0173f77a3ac35 libmustux-0.17.5.ebuild 680
-MD5 2ebf783ffb69fdd9d08aa5e9e1318724 libmustux-0.20.0.ebuild 800
+MD5 b5005eac4c8f48500ad4ceab230189ae libmustux-0.17.5.ebuild 747
+MD5 7272e0e2d103ff346b2ba1a49d798299 libmustux-0.20.0.ebuild 849
+MD5 8f6133f19a89b0416f5d2889b2677f4c ChangeLog 1012
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
-MD5 7514c5bcfb2fe30b6d14c9fdd04bae9a files/digest-libmustux-0.16.0 68
-MD5 763510bc391ac7485eb6af4aa4c01412 files/digest-libmustux-0.20.0 68
+MD5 1567f5b601b160aea8172e19fce537d6 libmustux-0.16.0.ebuild 867
 MD5 fef0b54e949cfb0fe28896608d517516 files/libmustux-0.16.0-alsalib-fix.patch 480
+MD5 7514c5bcfb2fe30b6d14c9fdd04bae9a files/digest-libmustux-0.16.0 68
 MD5 ef3ef2ffeec56ba14dda1f266a6e4c13 files/digest-libmustux-0.17.5 68
+MD5 763510bc391ac7485eb6af4aa4c01412 files/digest-libmustux-0.20.0 68
diff --git a/media-libs/libmustux/libmustux-0.16.0.ebuild b/media-libs/libmustux/libmustux-0.16.0.ebuild
index 0fafd9b84f5e..7e5bdbb07551 100644
--- a/media-libs/libmustux/libmustux-0.16.0.ebuild
+++ b/media-libs/libmustux/libmustux-0.16.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/libmustux-0.16.0.ebuild,v 1.4 2004/02/01 12:47:54 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/libmustux-0.16.0.ebuild,v 1.5 2004/02/09 12:24:33 eradicator Exp $
+
+inherit kde-functions
 
 DESCRIPTION="Protux - Libary"
 HOMEPAGE="http://www.nognu.org/protux"
@@ -16,6 +18,8 @@ DEPEND="virtual/x11
 	>=x11-libs/qt-3
 	media-libs/alsa-lib"
 
+set-qtdir 3
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -24,7 +28,7 @@ src_unpack() {
 }
 
 src_compile() {
-
+	export QT_MOC=${QTDIR}/bin/moc
 	cd ${S}
 	make -f admin/Makefile.common
 	econf
diff --git a/media-libs/libmustux/libmustux-0.17.5.ebuild b/media-libs/libmustux/libmustux-0.17.5.ebuild
index bc489c92f28d..8267879f639e 100644
--- a/media-libs/libmustux/libmustux-0.17.5.ebuild
+++ b/media-libs/libmustux/libmustux-0.17.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/libmustux-0.17.5.ebuild,v 1.3 2003/09/11 01:17:47 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/libmustux-0.17.5.ebuild,v 1.4 2004/02/09 12:24:33 eradicator Exp $
+
+inherit kde-functions
 
 DESCRIPTION="Protux - Libary"
 HOMEPAGE="http://www.nognu.org/protux"
@@ -16,8 +18,10 @@ DEPEND="virtual/x11
 	>=x11-libs/qt-3
 	media-libs/alsa-lib"
 
-src_compile() {
+set-qtdir 3
 
+src_compile() {
+	export QT_MOC=${QTDIR}/bin/moc
 	cd ${S}
 	make -f admin/Makefile.common
 	econf
diff --git a/media-libs/libmustux/libmustux-0.20.0.ebuild b/media-libs/libmustux/libmustux-0.20.0.ebuild
index 8dc34111f1ac..c043aca802b5 100644
--- a/media-libs/libmustux/libmustux-0.20.0.ebuild
+++ b/media-libs/libmustux/libmustux-0.20.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/libmustux-0.20.0.ebuild,v 1.1 2003/12/20 17:00:52 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmustux/libmustux-0.20.0.ebuild,v 1.2 2004/02/09 12:24:33 eradicator Exp $
+
+inherit kde-functions
 
 DESCRIPTION="Protux - Libary"
 HOMEPAGE="http://www.nognu.org/protux"
@@ -18,9 +20,10 @@ DEPEND="virtual/x11
 	>=x11-libs/qt-3
 	media-libs/alsa-lib"
 
-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"