add icon for gnome, bug #55272, remove old versions, add arts usefla

10 files changed, 20 insertions, 364 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index a8a2d6aa3459..4d8a84b5eb78 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -3,6 +3,13 @@
 # /home/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.46 2004/03/27 16:18:17
 # lanius Exp $
 
+*k3b-0.11.12-r1 (03 Jul 2004)
+
+  03 Jul 2004; Heinrich Wendel <lanius@gentoo.org> k3b-0.11.11.ebuild,
+  k3b-0.11.12-r1.ebuild, k3b-0.11.12.ebuild, k3b-0.11.6.ebuild,
+  k3b-0.11.9.ebuild:
+  add icon for gnome, bug #55272, remove old versions, add arts useflag
+
 *k3b-0.11.12 (25 Jun 2004)
 
   25 Jun 2004; Carsten Lohrke <carlo@gentoo.org> +k3b-0.11.12.ebuild:
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 9ae47e203515..5e3208f22cdd 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,13 +1,7 @@
-MD5 41dd1b962e97de1d82229b6167ab214f k3b-0.11.12.ebuild 3513
-MD5 8e1eb0354ea754a931e091cba33fdd2e k3b-0.11.9.ebuild 3493
-MD5 1eae6444c51de192d417623014613d2b k3b-0.11.11.ebuild 3516
-MD5 4b5609b3bca84447d5131c3043edcb20 k3b-0.11.6.ebuild 2999
+MD5 0f8570c9d951a9d585a4bd0ff29e8410 k3b-0.11.12-r1.ebuild 3704
 MD5 8f2dfd6649d8a0127cca7edcec5ee948 k3b-0.11.10.ebuild 3495
 MD5 f44469e1045bc11c3415f7de956e348b ChangeLog 9007
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
+MD5 090e222085c5d03ed73630217ec680ea files/digest-k3b-0.11.12-r1 205
 MD5 457551a84f78e8240d3b588d35892208 files/digest-k3b-0.11.10 205
-MD5 c0a7b6b4c3e4c05353f3cd0e0050c67d files/digest-k3b-0.11.11 205
-MD5 090e222085c5d03ed73630217ec680ea files/digest-k3b-0.11.12 205
-MD5 8424e87b486b4f6ef9d435a617908d5d files/digest-k3b-0.11.6 131
-MD5 8febec3bdad0b5d655563621c7b2f95c files/digest-k3b-0.11.9 204
 MD5 af62583ac173cdc2cc55a43cdc1b48f8 files/k3b-0.10.3-hacked-cdrdao.patch 690
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.11 b/app-cdr/k3b/files/digest-k3b-0.11.11
deleted file mode 100644
index 2f9834ccfe1e..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b3f18fa0813ca4b6d2b16689cff800f4 k3b-0.11.11.tar.bz2 3187016
-MD5 6a2f9f531cd63a50bf600fc8044ef7f1 k3bmonkeyaudioplugin.tar.bz2 439377
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.12 b/app-cdr/k3b/files/digest-k3b-0.11.12-r1
index c1f82faada8e..c1f82faada8e 100644
--- a/app-cdr/k3b/files/digest-k3b-0.11.12
+++ b/app-cdr/k3b/files/digest-k3b-0.11.12-r1
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.6 b/app-cdr/k3b/files/digest-k3b-0.11.6
deleted file mode 100644
index cd04c0af5e0c..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0015b9ad457713425464dbdad6a15ab9 k3b-0.11.6.tar.bz2 3194007
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.9 b/app-cdr/k3b/files/digest-k3b-0.11.9
deleted file mode 100644
index 9b0843594cdc..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 88f46a5cfbda5fa89b4bfee504567df1 k3b-0.11.9.tar.bz2 3217141
-MD5 6a2f9f531cd63a50bf600fc8044ef7f1 k3bmonkeyaudioplugin.tar.bz2 439377
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/k3b-0.11.11.ebuild b/app-cdr/k3b/k3b-0.11.11.ebuild
deleted file mode 100644
index 6c86c4a17240..000000000000
--- a/app-cdr/k3b/k3b-0.11.11.ebuild
+++ /dev/null
@@ -1,120 +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.11.ebuild,v 1.2 2004/06/24 21:34:27 agriffis 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 )"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="debug dvdr kde oggvorbis mad flac encode monkey"
-
-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 )"
-
-need-kde 3.1
-
-RDEPEND="${DEPEND}
-	>=app-cdr/cdrtools-1.11
-	>=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 )"
-
-# These are the languages supported by k3b as of version 0.11.6.
-# 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 ca bs da de cs el es et fi fo fr gl hu ja it nb \
-nl pl pt ro ru sk sl ta sr sv tr xh xx zu nso ven en_GB pt_BR \
-zh_CN zh_TW"
-
-# Documentation packages are less (in general they may contain
-# other packages too,  not in this case)
-LANGS_DOC="da de es et fr pt ru sv"
-
-I18N="${PN}-i18n-${PV%.*}"
-
-for pkg in ${LANGS}
-do
-	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix="
-
-	use debug && myconf="${myconf} --enable-debugging --enable-profiling" \
-		|| myconf="${myconf} --disable-debugging --disable-profiling"
-	use kde || myconf="${myconf} --without-k3bsetup"
-
-	# 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
-		MAKE_PO="SUBDIRS = "
-		for lang in ${LANGS}
-		do
-			use linguas_${lang} && MAKE_PO="${MAKE_PO} ${lang}"
-		done
-		sed -i -e "s:^SUBDIRS = .*:${MAKE_PO}:" ${S}/po/Makefile.in
-
-		MAKE_DOC="SUBDIRS = "
-		for langdoc in ${LANGS_DOC}
-		do
-			use linguas_${langdoc} && MAKE_DOC="${MAKE_DOC} ${langdoc}"
-		done
-		sed -i -e "s:^SUBDIRS = .*:${MAKE_DOC}:" ${S}/doc/Makefile.in
-
-		kde_src_compile
-	fi
-	S=${_S}
-
-	if use monkey ; then
-		cd ../k3bmonkeyaudioplugin
-		econf || die "econf failed"
-		emake || die "emake failed"
-	fi
-}
-
-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
-	dodir /usr/share/applications
-	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
-	rm -fR ${D}/usr/share/applnk/
-
-	if use monkey; then
-		cd ../k3bmonkeyaudioplugin
-		make DESTDIR=${D} install || die
-	fi
-}
-
-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."
-}
diff --git a/app-cdr/k3b/k3b-0.11.12.ebuild b/app-cdr/k3b/k3b-0.11.12-r1.ebuild
index 71ed19fad1c3..de2fb7cdbd73 100644
--- a/app-cdr/k3b/k3b-0.11.12.ebuild
+++ b/app-cdr/k3b/k3b-0.11.12-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2004/06/25 11:47:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.12-r1.ebuild,v 1.1 2004/07/03 09:23:02 lanius Exp $
 
 inherit kde
 
@@ -11,14 +11,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="debug dvdr kde oggvorbis mad flac encode monkey"
+IUSE="arts debug dvdr kde oggvorbis mad flac encode monkey"
 
 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 )"
+	oggvorbis? ( media-libs/libvorbis )
+	arts? ( kde-base/arts )"
 
 need-kde 3.1
 
@@ -58,6 +59,7 @@ src_compile() {
 	use debug && myconf="${myconf} --enable-debugging --enable-profiling" \
 		|| myconf="${myconf} --disable-debugging --disable-profiling"
 	use kde || myconf="${myconf} --without-k3bsetup"
+	use arts || myconf="${myconf} --without-arts"
 
 	# Build process of K3B
 	kde_src_compile
@@ -100,11 +102,15 @@ src_install() {
 		make DESTDIR=${D} install || die
 	fi
 
-	# install menu entry
+	# install menu entry and icon
 	dodir /usr/share/applications
 	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.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/
 
 	if use monkey; then
 		cd ../k3bmonkeyaudioplugin
diff --git a/app-cdr/k3b/k3b-0.11.6.ebuild b/app-cdr/k3b/k3b-0.11.6.ebuild
deleted file mode 100644
index 00226020a33e..000000000000
--- a/app-cdr/k3b/k3b-0.11.6.ebuild
+++ /dev/null
@@ -1,103 +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.6.ebuild,v 1.11 2004/06/24 21:34:27 agriffis 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="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 )"
-RDEPEND="${DEPEND}
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  media-video/transcode
-		  media-video/vcdimager )"
-
-need-kde 3.1
-
-# These are the languages supported by k3b as of version 0.11.6.
-# 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 ca bs da de cs el es et fi fo fr gl hu ja it nb \
-nl pl pt ro ru sk sl ta sr sv tr xh xx zu nso ven en_GB pt_BR \
-zh_CN zh_TW"
-
-# Documentation packages are less (in general they may contain
-# other packages too,  not in this case)
-LANGS_DOC="da de es et fr pt ru sv"
-
-I18N="${PN}-i18n-${PV%.*}"
-
-for pkg in ${LANGS}
-do
-	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix="
-
-	use debug && myconf="${myconf} --enable-debugging --enable-profiling" \
-		|| myconf="${myconf} --disable-debugging --disable-profiling"
-	use kde || myconf="${myconf} --without-k3bsetup"
-
-	# 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
-		MAKE_PO="SUBDIRS = "
-		for lang in ${LANGS}
-		do
-			use linguas_${lang} && MAKE_PO="${MAKE_PO} ${lang}"
-		done
-		sed -i -e "s:^SUBDIRS = .*:${MAKE_PO}:" ${S}/po/Makefile.in
-
-		MAKE_DOC="SUBDIRS = "
-		for langdoc in ${LANGS_DOC}
-		do
-			use linguas_${langdoc} && MAKE_DOC="${MAKE_DOC} ${langdoc}"
-		done
-		sed -i -e "s:^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
-}
-
-pkg_postinst() {
-	if use kde; then
-		einfo "The k3b setup program will offer to change some permissions and"
-		einfo "create a user group.  These changes are not necessary.  We recommend"
-		einfo "that you clear the two check boxes that 'let k3b make changes for"
-		einfo "cdrecord and cdrdao' and 'let k3b make changes for the devices when"
-		einfo "running k3b setup'."
-	fi
-}
diff --git a/app-cdr/k3b/k3b-0.11.9.ebuild b/app-cdr/k3b/k3b-0.11.9.ebuild
deleted file mode 100644
index 94888f24e63e..000000000000
--- a/app-cdr/k3b/k3b-0.11.9.ebuild
+++ /dev/null
@@ -1,120 +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.9.ebuild,v 1.13 2004/06/24 21:34:27 agriffis 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 )"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc amd64"
-IUSE="debug dvdr kde oggvorbis mad flac encode monkey"
-
-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 )"
-
-need-kde 3.1
-
-RDEPEND="${DEPEND}
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  media-video/transcode
-		  media-video/vcdimager )"
-
-# These are the languages supported by k3b as of version 0.11.6.
-# 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 ca bs da de cs el es et fi fo fr gl hu ja it nb \
-nl pl pt ro ru sk sl ta sr sv tr xh xx zu nso ven en_GB pt_BR \
-zh_CN zh_TW"
-
-# Documentation packages are less (in general they may contain
-# other packages too,  not in this case)
-LANGS_DOC="da de es et fr pt ru sv"
-
-I18N="${PN}-i18n-${PV%.*}"
-
-for pkg in ${LANGS}
-do
-	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix="
-
-	use debug && myconf="${myconf} --enable-debugging --enable-profiling" \
-		|| myconf="${myconf} --disable-debugging --disable-profiling"
-	use kde || myconf="${myconf} --without-k3bsetup"
-
-	# 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
-		MAKE_PO="SUBDIRS = "
-		for lang in ${LANGS}
-		do
-			use linguas_${lang} && MAKE_PO="${MAKE_PO} ${lang}"
-		done
-		sed -i -e "s:^SUBDIRS = .*:${MAKE_PO}:" ${S}/po/Makefile.in
-
-		MAKE_DOC="SUBDIRS = "
-		for langdoc in ${LANGS_DOC}
-		do
-			use linguas_${langdoc} && MAKE_DOC="${MAKE_DOC} ${langdoc}"
-		done
-		sed -i -e "s:^SUBDIRS = .*:${MAKE_DOC}:" ${S}/doc/Makefile.in
-
-		kde_src_compile
-	fi
-	S=${_S}
-
-	if use monkey ; then
-		cd ../k3bmonkeyaudioplugin
-		econf || die "econf failed"
-		emake || die "emake failed"
-	fi
-}
-
-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
-	dodir /usr/share/applications
-	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
-	rm -fR ${D}/usr/share/applnk/
-
-	if use monkey; then
-		cd ../k3bmonkeyaudioplugin
-		make DESTDIR=${D} install || die
-	fi
-}
-
-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."
-}