ebuild clean up, removed monkey plugin from 0.11.12-r1, too

5 files changed, 9 insertions, 128 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 8c2f35cbd18e..c1184c6ef85b 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.71 2004/08/21 06:05:32 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.72 2004/09/14 13:29:32 carlo Exp $
+
+  14 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/k3b-0.10.3-hacked-cdrdao.patch, k3b-0.11.12-r1.ebuild,
+  -k3b-0.11.13.ebuild:
+  ebuild clean up, removed monkey plugin from 0.11.12-r1, too
 
   21 Aug 2004; Lars Weiler <pylon@gentoo.org> k3b-0.11.10.ebuild,
   k3b-0.11.12-r1.ebuild, k3b-0.11.13.ebuild, k3b-0.11.14.ebuild:
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.13 b/app-cdr/k3b/files/digest-k3b-0.11.13
deleted file mode 100644
index c0970de8ac32..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 334a0545e42b77846f1eab1b67ef6c28 k3b-0.11.13.tar.bz2 3189214
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/k3b-0.10.3-hacked-cdrdao.patch b/app-cdr/k3b/files/k3b-0.10.3-hacked-cdrdao.patch
deleted file mode 100644
index 378bfbf7c1d9..000000000000
--- a/app-cdr/k3b/files/k3b-0.10.3-hacked-cdrdao.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- k3b-0.10.3/src/core/k3bdefaultexternalprograms.cpp.az	2003-12-16 20:39:24.328515576 +0200
-+++ k3b-0.10.3/src/core/k3bdefaultexternalprograms.cpp	2003-12-16 20:40:14.855834256 +0200
-@@ -522,7 +522,8 @@
- 
-   // SuSE 9.0 ships with a patched cdrdao 1.1.7 which contains an updated libschily
-   if( bin->version > K3bVersion( 1, 1, 7 ) || 
--      ( bin->version == K3bVersion( 1, 1, 7 ) && bin->version.suffix() == "-suse" ) ) {
-+      /* K3bVersion treats a version without suffix as newer than one with suffix */
-+      ( bin->version <= K3bVersion( 1, 1, 7 ) && bin->version.suffix() == "-gentoo" ) ) {
-     bin->addFeature( "plain-atapi" );
-     bin->addFeature( "hacked-atapi" );
-   }
diff --git a/app-cdr/k3b/k3b-0.11.12-r1.ebuild b/app-cdr/k3b/k3b-0.11.12-r1.ebuild
index 9565f994214a..dc9fceb7897e 100644
--- a/app-cdr/k3b/k3b-0.11.12-r1.ebuild
+++ b/app-cdr/k3b/k3b-0.11.12-r1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.12-r1.ebuild,v 1.5 2004/08/21 06:05:32 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.12-r1.ebuild,v 1.6 2004/09/14 13:29:32 carlo Exp $
 
 inherit kde
 
 DESCRIPTION="K3b, KDE CD Writing Software"
 HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	monkey? ( mirror://sourceforge/${PN}/k3bmonkeyaudioplugin.tar.bz2 )"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc amd64"
-IUSE="arts debug dvdr kde oggvorbis mad flac encode monkey"
+IUSE="arts debug dvdr kde oggvorbis mad flac encode"
 
 DEPEND="kde? ( >=kde-base/kdebase-3.1 )
 	>=media-sound/cdparanoia-3.9.8
@@ -83,12 +82,6 @@ src_compile() {
 		kde_src_compile
 	fi
 	S=${_S}
-
-	if use monkey ; then
-		cd ../k3bmonkeyaudioplugin
-		econf || die "econf failed"
-		emake || die "emake failed"
-	fi
 }
 
 src_install() {
@@ -110,11 +103,6 @@ src_install() {
 	rm -fR ${D}/usr/share/applnk/
 	dodir /usr/share/pixmaps
 	cp ${D}/usr/share/icons/crystalsvg/32x32/apps/k3b.png ${D}/usr/share/pixmaps/
-
-	if use monkey; then
-		cd ../k3bmonkeyaudioplugin
-		make DESTDIR=${D} install || die
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-cdr/k3b/k3b-0.11.13.ebuild b/app-cdr/k3b/k3b-0.11.13.ebuild
deleted file mode 100644
index cfad12f192c1..000000000000
--- a/app-cdr/k3b/k3b-0.11.13.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.13.ebuild,v 1.3 2004/08/21 06:05:32 pylon Exp $
-
-inherit kde
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="arts debug dvdr kde oggvorbis mad flac encode"
-
-DEPEND="kde? ( >=kde-base/kdebase-3.1 )
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	flac? ( media-libs/flac )
-	mad? ( >=media-sound/madplay-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )
-	arts? ( kde-base/arts )"
-RDEPEND="kde? ( >=kde-base/kdebase-3.1 )
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	flac? ( media-libs/flac )
-	mad? ( >=media-sound/madplay-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )
-	arts? ( kde-base/arts )
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  !amd64? ( <media-video/transcode-0.6.12 )
-		  media-video/vcdimager )"
-need-kde 3.1
-
-I18N="${PN}-i18n-${PV%.*}"
-
-# These are the languages and translated documentation supported by k3b as of 
-# version 0.11.13. If you are using this ebuild as a model for another ebuild 
-# for another version of K3b, DO check whether these values are different.
-# Check the {po,doc}/Makefile.am files in k3b-i18n package.
-LANGS="ar bg bs ca cs da de el en_GB es et fi fo fr gl hu it ja nb nl nso pl pt pt_BR ro ru sk sl sr sv ta tr ven xh xx zh_CN zh_TW zu"
-LANGS_DOC="da de es et fr it pt pt_BR ru sv"
-
-MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d)
-MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d)
-
-if [ -n "$MAKE_PO" ] ; then
-	SRC_URI="${SRC_URI} mirror://sourceforge/k3b/${I18N}.tar.bz2"
-fi
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= $(use_with kde k3bsetup) $(use_with arts)"
-
-	# Build process of K3B
-	kde_src_compile
-
-	# Build process of K3B-i18n, select LINGUAS elements
-	S=${WORKDIR}/${I18N}
-	if [ -n "${LINGUAS}" -a -d "${S}" ] ; then
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_DOC}:" ${S}/doc/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry and icon
-	dodir /usr/share/applications
-	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	if use kde; then
-		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
-	fi
-	rm -fR ${D}/usr/share/applnk/
-	dodir /usr/share/pixmaps
-	cp ${D}/usr/share/icons/crystalsvg/32x32/apps/k3b.png ${D}/usr/share/pixmaps/
-}
-
-pkg_postinst() {
-	einfo "Note that k3b will report problems regarding the permissions of cdrecord"
-	einfo "and cdrdao, and will suggest some changes for your system. You are free"
-	einfo "to follow those advices, note nonetheless that on a default Gentoo install"
-	einfo "k3b should run fine when you are in the cdrom and cdrw group."
-}