Cleaning up + fixing bug #111609)

(Portage version: 2.0.51.22-r2)

7 files changed, 12 insertions, 113 deletions

diff --git a/media-sound/kradio/ChangeLog b/media-sound/kradio/ChangeLog
index e165915e571d..c7a7cedd6984 100644
--- a/media-sound/kradio/ChangeLog
+++ b/media-sound/kradio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/kradio
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.11 2005/09/05 09:12:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.12 2005/11/21 10:17:44 phosphan Exp $
+
+  21 Nov 2005; Patrick Kursawe <phosphan@gentoo.org>
+  -kradio-1.0_beta1.ebuild, -kradio-1.0_beta3.ebuild,
+  kradio-1.0b_beta3.ebuild:
+  Hard-disabling lirc plugin when lirc not in USE (bug #111609)
+  Removing obsolete versions
 
 *kradio-1.0b_beta3 (05 Sep 2005)
 
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
index 52eecf09c890..4efb186bbb60 100644
--- a/media-sound/kradio/Manifest
+++ b/media-sound/kradio/Manifest
@@ -1,11 +1,7 @@
-MD5 5476db5166c8c47d9803887120b66db3 kradio-1.0_beta1.ebuild 1429
-MD5 80d1bec2c22b6683540d06284d306ec1 kradio-1.0_beta3.ebuild 1313
 MD5 7641a174b3552f6e1e2e899c60d3c730 kradio-0.3.0_alpha20041207.ebuild 670
 MD5 d9a9da73c6bea3194bb3451998737516 ChangeLog 1785
 MD5 9d3144020349b12bd44321fcd3b72069 metadata.xml 220
-MD5 94be1438d2dcde8fd25291704967e2fe kradio-1.0b_beta3.ebuild 1315
-MD5 ee47af0a474d75351f4f0a88b087752e files/digest-kradio-1.0_beta1 69
-MD5 d50f532f68fb07c187dfd279a61ee36c files/digest-kradio-1.0_beta3 69
+MD5 9afaf84a9d51a3afbece1a645186a7c0 kradio-1.0b_beta3.ebuild 1348
 MD5 4c782588fc9a607d0ddbaced504a9ba8 files/0.3.0_alpha20041207-gcc.patch 556
 MD5 ae65eb1e2ac124f1898a6be7bcd4c376 files/digest-kradio-0.3.0_alpha20041207 79
 MD5 88c3b63a3aebe2f1f776899932fbef7b files/digest-kradio-1.0b_beta3 70
diff --git a/media-sound/kradio/files/digest-kradio-1.0_beta1 b/media-sound/kradio/files/digest-kradio-1.0_beta1
deleted file mode 100644
index 7250a911d2b0..000000000000
--- a/media-sound/kradio/files/digest-kradio-1.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0531ad98dffe28dfd79da94139f0977 kradio-1.0beta1.tar.bz2 1269047
diff --git a/media-sound/kradio/files/digest-kradio-1.0_beta3 b/media-sound/kradio/files/digest-kradio-1.0_beta3
deleted file mode 100644
index e20ed842489a..000000000000
--- a/media-sound/kradio/files/digest-kradio-1.0_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e85ae5772c98953bde76f8b85a15caa kradio-1.0beta3.tar.bz2 1423815
diff --git a/media-sound/kradio/kradio-1.0_beta1.ebuild b/media-sound/kradio/kradio-1.0_beta1.ebuild
deleted file mode 100644
index e936cef5fd6d..000000000000
--- a/media-sound/kradio/kradio-1.0_beta1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0_beta1.ebuild,v 1.2 2005/05/27 14:03:18 phosphan Exp $
-
-inherit kde
-
-MY_PV="${PV/_/}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="kradio is a radio tuner application for KDE"
-HOMEPAGE="http://kradio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="lirc encode vorbis ogg"
-
-RDEPEND="lirc? ( app-misc/lirc )
-	media-libs/libsndfile
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	ogg? ( media-libs/libogg )"
-
-DEPEND="${RDEPEND}
-	>=kde-base/unsermake-0.3.1.4319.0"
-
-need-kde 3.2
-
-src_compile() {
-	if ! use vorbis; then
-		sed -e 's/\(ac_cv_lib_vorbisenc_vorbis_encode_init=\)yes$/\1no/' \
-			-i configure
-	fi
-	if ! use encode; then
-		sed -e 's/\(ac_cv_lib_mp3lame_lame_init=\)yes$/\1no/' \
-			-i configure
-	fi
-	if ! use ogg; then
-		sed -e 's/\(ac_cv_lib_ogg_ogg_stream_packetin=\)yes$/\1no/' \
-			-i configure
-	fi
-	export PATH="${PATH}:/usr/kde/unsermake/"
-	econf $(use_with arts) || die "configure failed"
-	unsermake ${MAKEOPTS} || die "unsermake failed"
-}
-
-src_install() {
-	export PATH="${PATH}:/usr/kde/unsermake"
-	unsermake DESTDIR="${D}" install || die "unsermake install failed"
-}
-
-src_test() {
-	export PATH="${PATH}:/usr/kde/unsermake"
-	unsermake check
-}
diff --git a/media-sound/kradio/kradio-1.0_beta3.ebuild b/media-sound/kradio/kradio-1.0_beta3.ebuild
deleted file mode 100644
index 68641af67403..000000000000
--- a/media-sound/kradio/kradio-1.0_beta3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0_beta3.ebuild,v 1.1 2005/08/26 10:01:45 phosphan Exp $
-
-inherit kde
-
-MY_PV="${PV/_/}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="kradio is a radio tuner application for KDE"
-HOMEPAGE="http://kradio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="lirc encode vorbis ogg"
-
-DEPEND="lirc? ( app-misc/lirc )
-	media-libs/libsndfile
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	ogg? ( media-libs/libogg )
-	arts? ( kde-base/arts )"
-
-RDEPEND="${DEPEND}"
-
-need-kde 3.2
-
-src_compile() {
-	if ! use vorbis; then
-		sed -e 's/\(ac_cv_lib_vorbisenc_vorbis_encode_init=\)yes$/\1no/' \
-			-i configure || die "Couldn't disable vorbis support"
-	fi
-	if ! use encode; then
-		sed -e 's/\(ac_cv_lib_mp3lame_lame_init=\)yes$/\1no/' \
-			-i configure || die "Couldn't disable lame support"
-	fi
-	if ! use ogg; then
-		sed -e 's/\(ac_cv_lib_ogg_ogg_stream_packetin=\)yes$/\1no/' \
-			-i configure || die "Couldn't disable ogg support"
-	fi
-	export PATH="${PATH}:/usr/kde/unsermake/"
-	econf $(use_with arts) || die "configure failed"
-	emake || die "emake failed"
-}
-
diff --git a/media-sound/kradio/kradio-1.0b_beta3.ebuild b/media-sound/kradio/kradio-1.0b_beta3.ebuild
index 7b9d2fc87c7c..12f273514428 100644
--- a/media-sound/kradio/kradio-1.0b_beta3.ebuild
+++ b/media-sound/kradio/kradio-1.0b_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0b_beta3.ebuild,v 1.1 2005/09/05 09:12:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0b_beta3.ebuild,v 1.2 2005/11/21 10:17:44 phosphan Exp $
 
 inherit kde
 
@@ -40,7 +40,9 @@ src_compile() {
 		sed -e 's/\(ac_cv_lib_ogg_ogg_stream_packetin=\)yes$/\1no/' \
 			-i configure || die "Couldn't disable ogg support"
 	fi
-	export PATH="${PATH}:/usr/kde/unsermake/"
+	if ! use lirc; then
+		sed -e 's/lirc//' -i kradio3/plugins/Makefile.in
+	fi
 	econf $(use_with arts) || die "configure failed"
 	emake || die "emake failed"
 }