version bump

(Portage version: 2.0.51.19)

7 files changed, 14 insertions, 153 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index bd5c8da83ddb..5b3836764449 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.113 2005/06/15 16:16:17 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.114 2005/06/18 13:00:38 carlo Exp $
+
+*k3b-0.12.1 (18 Jun 2005)
+
+  18 Jun 2005; Carsten Lohrke <carlo@gentoo.org> -k3b-0.12_beta2.ebuild,
+  -k3b-0.12.ebuild, +k3b-0.12.1.ebuild:
+  version bump
 
 *k3b-0.12 (15 Jun 2005)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 11019ea3905a..93b027d0089a 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2334d33746d21f20ebd9614008039c1e k3b-0.12_beta2.ebuild 3820
-MD5 b4633ffc40b301f7135b4b3a84c03011 k3b-0.12.ebuild 3297
 MD5 1150cc0633c21032294eeffff138f880 k3b-0.11.24.ebuild 3081
-MD5 dc15df702ec887409e452d169e2cd82b ChangeLog 15838
+MD5 be4b11c9159a7e61e4cc93fe45058465 k3b-0.12.1.ebuild 3302
+MD5 cfd369822fde584178dbe5f05a08b675 ChangeLog 15994
 MD5 f4e8aaaad243ce6f84523bc506aefcf7 k3b-0.11.23-r2.ebuild 3135
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 02c5044f7b1d0bf5b54e062955d321f5 files/digest-k3b-0.12_beta2 67
 MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23-r2 132
 MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
-MD5 76014ed3b681cf06d26115d127c43f11 files/digest-k3b-0.12 129
 MD5 9271bc6af714f4cfb2a7b4a69fb86b1b files/digest-k3b-0.11.24 132
+MD5 8d4e4938963821d50c7001a994b28737 files/digest-k3b-0.12.1 133
 MD5 5f469d8bb9067596d861b4a9a0a450a1 files/k3b-dvdrip-transcode.patch 1999
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCsJkkI1lqEGTUzyQRAsDpAKCQoNnNTMg2eEGo48yznCcg7Jo6gwCfUtn1
-bqpVm+58/shimjb8tEnu/Hs=
-=ujF0
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/digest-k3b-0.12 b/app-cdr/k3b/files/digest-k3b-0.12
deleted file mode 100644
index e105dacf30ca..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 df8f53698d28697213dfa6c9612bb249 k3b-0.12.tar.bz2 3755077
-MD5 9fb4531d43f5477368d2069e0ff4b876 k3b-i18n-0.12.tar.bz2 3450551
diff --git a/app-cdr/k3b/files/digest-k3b-0.12.1 b/app-cdr/k3b/files/digest-k3b-0.12.1
new file mode 100644
index 000000000000..c223ce27ad42
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.12.1
@@ -0,0 +1,2 @@
+MD5 d1354cc0d0b1e49b7d3f20defbedc9e9 k3b-0.12.1.tar.bz2 3768711
+MD5 d67b1dc8ededad4ffb75344d865913a2 k3b-i18n-0.12.1.tar.bz2 4138880
diff --git a/app-cdr/k3b/files/digest-k3b-0.12_beta2 b/app-cdr/k3b/files/digest-k3b-0.12_beta2
deleted file mode 100644
index e642532bfd79..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.12_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7982e093f2da5b0b279b7d8d871db0a0 k3b-0.12beta2.tar.bz2 3754279
diff --git a/app-cdr/k3b/k3b-0.12.ebuild b/app-cdr/k3b/k3b-0.12.1.ebuild
index d21124902b7b..1afe1405f4c6 100644
--- a/app-cdr/k3b/k3b-0.12.ebuild
+++ b/app-cdr/k3b/k3b-0.12.1.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/app-cdr/k3b/k3b-0.12.ebuild,v 1.2 2005/06/15 21:09:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.1.ebuild,v 1.1 2005/06/18 13:00:38 carlo Exp $
 
 inherit kde eutils flag-o-matic
 
@@ -48,8 +48,7 @@ I18N="${PN}-i18n-${PV}"
 # version 0.11.x. 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="bg br bs ca cs cy da de el en_GB es et fr ga hi is it lt mk nb nl nn pl pt pt_BR ru sr sv ta tr uk zh_CN"
-
+LANGS="bg br bs ca cs cy da de el en_GB es et fr ga hi hu is it lt mk nb nl nn pa pl pt pt_BR ru sr sv ta tr uk zh_CN"
 
 MAKE_LANGS=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
 MAKE_lANGS=${MAKE_lANGS/sr/sr sr@Latn}
diff --git a/app-cdr/k3b/k3b-0.12_beta2.ebuild b/app-cdr/k3b/k3b-0.12_beta2.ebuild
deleted file mode 100644
index 3fc975fe67b6..000000000000
--- a/app-cdr/k3b/k3b-0.12_beta2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12_beta2.ebuild,v 1.4 2005/06/11 17:59:34 josejx Exp $
-
-inherit kde eutils flag-o-matic
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="css dvdr encode ffmpeg flac hal kde mp3 musepack vorbis"
-
-DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	hal? ( =sys-apps/dbus-0.23*
-		=sys-apps/hal-0.4* )
-	media-libs/libsamplerate
-	media-libs/taglib
-	media-libs/musicbrainz
-	>=media-sound/cdparanoia-3.9.8
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmusepack-1.1 )
-	vorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	css? ( media-libs/libdvdcss )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  media-video/transcode
-		  media-video/vcdimager )"
-
-need-kde 3.3
-
-I18N="${PN}-i18n-${PV%.*}"
-
-# debug build
-RESTRICT="nostrip"
-filter-flags -fomit-frame-pointer
-
-# These are the languages and translated documentation supported by k3b for 
-# version 0.11.x. 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 pt ru sv"
-
-#MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-#MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-
-# for X in $LANGS; do
-# 	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-# done
-# 
-# src_unpack() {
-# 	kde_src_unpack
-# 	epatch "${FILESDIR}/k3b-0.11.17-noarts.patch"
-# 	make -f admin/Makefile.common || die
-# }
-
-pkg_setup() {
-	use hal && if ! built_with_use dbus qt ; then
-		eerror "You are trying to compile ${CATEGORY}/${P} with the \"hal\" USE flag enabled,"
-		eerror "but sys-apps/dbus is not built with Qt support."
-		die
-	fi
-}
-
-src_compile() {
-# 	local _S=${S}
-	local myconf="--enable-libsuffix= --with-external-libsamplerate \
-			--without-resmgr --with-musicbrainz \
-			$(use_with kde k3bsetup)	\
-			$(use_with hal)			\
-			$(use_with encode lame)		\
-			$(use_with ffmpeg)		\
-			$(use_with flac)		\
-			$(use_with vorbis oggvorbis)	\
-			$(use_with mp3 libmad)		\
-			$(use_with musepack)"
-
-	# debug build
-	myconf="${myconf} --enable-debug=full"
-
-	# 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
-	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/
-}
-
-pkg_postinst() {
-	echo
-	einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
-	einfo "Usually, it is sufficient to be in the cdrom or cdrw group."
-	echo
-}