Version bump, closes bug 171196.

(Portage version: 2.1.2.2)

6 files changed, 28 insertions, 166 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 416a7f23ba61..105c5e1ce508 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.183 2007/02/11 09:36:45 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.184 2007/03/17 12:09:35 cryos Exp $
+
+*k3b-1.0 (17 Mar 2007)
+
+  17 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org> -k3b-1.0_rc4.ebuild,
+  -k3b-1.0_rc5.ebuild, +k3b-1.0.ebuild:
+  Version bump, closes bug 171196.
 
   11 Feb 2007; Ioannis Aslanidis <deathwing00@gentoo.org>
   -k3b-1.0_beta1.ebuild:
diff --git a/app-cdr/k3b/files/digest-k3b-1.0 b/app-cdr/k3b/files/digest-k3b-1.0
new file mode 100644
index 000000000000..2d6b130f7623
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-1.0
@@ -0,0 +1,6 @@
+MD5 02bf955059adfe9ac8a11d36fb34a11c k3b-1.0.tar.bz2 5102225
+RMD160 27c2cf0a96a037f0807a7b4f6ae393c1c68a2442 k3b-1.0.tar.bz2 5102225
+SHA256 b1ab85ad003b3362a964e7516ba21ecb238b199379e449980041a4292d8d2294 k3b-1.0.tar.bz2 5102225
+MD5 19534f984a9846b50bf027d1a9ce4988 k3b-i18n-1.0.tar.bz2 6839311
+RMD160 8ed1600e28ae84fa1522f7b3ae13e8ec09e2b564 k3b-i18n-1.0.tar.bz2 6839311
+SHA256 5e49d698bef02d15c72988e0384e531465ded67819b8e0206045e9ab11a7153a k3b-i18n-1.0.tar.bz2 6839311
diff --git a/app-cdr/k3b/files/digest-k3b-1.0_rc4 b/app-cdr/k3b/files/digest-k3b-1.0_rc4
deleted file mode 100644
index 7e79773eb1f4..000000000000
--- a/app-cdr/k3b/files/digest-k3b-1.0_rc4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 785e81fe3ee695d3b927cef9759a9753 k3b-1.0rc4.tar.bz2 3828519
-RMD160 d9e8253257a0a9c6213ce4fab3366ed2c71b2c76 k3b-1.0rc4.tar.bz2 3828519
-SHA256 90c423815b1c3de8a20ede5d08a32f95f17fdb2629bacfcdb04fa8324691f11e k3b-1.0rc4.tar.bz2 3828519
diff --git a/app-cdr/k3b/files/digest-k3b-1.0_rc5 b/app-cdr/k3b/files/digest-k3b-1.0_rc5
deleted file mode 100644
index 8a00b58de293..000000000000
--- a/app-cdr/k3b/files/digest-k3b-1.0_rc5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e91f86f34f2db241759b36f6f07960e5 k3b-1.0rc5.tar.bz2 3827799
-RMD160 ec558c017e2d9a46ab22f62036372ec301d826af k3b-1.0rc5.tar.bz2 3827799
-SHA256 5a717e4e3a9e3820b81a028c5358e834583e0ba8f3602092abf50e345bc3e373 k3b-1.0rc5.tar.bz2 3827799
diff --git a/app-cdr/k3b/k3b-1.0_rc5.ebuild b/app-cdr/k3b/k3b-1.0.ebuild
index 3f231403d779..59b5ae687ae6 100644
--- a/app-cdr/k3b/k3b-1.0_rc5.ebuild
+++ b/app-cdr/k3b/k3b-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_rc5.ebuild,v 1.1 2007/02/09 14:27:06 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.ebuild,v 1.1 2007/03/17 12:09:35 cryos Exp $
 
 inherit kde eutils
 
@@ -53,15 +53,15 @@ need-kde 3.2
 
 # The following commented lines will have to be uncommented once the final
 # release is done. This pre-release version does not support i18n.
-#I18N="${PN}-i18n-${PV}"
+I18N="${PN}-i18n-${PV}"
 
 # Supported languages and translated documentation
-#LANGS="af bg bn br bs ca cs cy da de el en_GB es et eu fr ga he hi hu is it ja km lt mk ms nb nds nl nn pa pl pt pt_BR ro ru se sl sr sr@Latn sv ta tr uk zh_CN"
+LANGS="af bg bn br bs ca cs cy da de el en_GB es et eu fr ga he hi hu is it ja km lt mk ms nb nds nl nn pa pl pt pt_BR ro ru se sl sr sr@Latn sv ta tr uk zh_CN"
 
-#for X in ${LANGS}; do
-#	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-#	IUSE="${IUSE} linguas_${X}"
-#done
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+	IUSE="${IUSE} linguas_${X}"
+done
 
 pkg_setup() {
 	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
@@ -114,20 +114,20 @@ src_compile() {
 	kde_src_compile
 
 	# Build process of K3b-i18n
-#	if [ -d "${WORKDIR}/${I18N}" ]; then
-#		KDE_S="${WORKDIR}/${I18N}" \
-#		kde_src_compile
-#	fi
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_compile
+	fi
 }
 
 src_install() {
 	kde_src_install
 	dodoc FAQ KNOWNBUGS PERMISSIONS
 
-#	if [ -d "${WORKDIR}/${I18N}" ]; then
-#		KDE_S="${WORKDIR}/${I18N}" \
-#		kde_src_install
-#	fi
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_install
+	fi
 
 	# Move menu entry
 	if use kde; then
diff --git a/app-cdr/k3b/k3b-1.0_rc4.ebuild b/app-cdr/k3b/k3b-1.0_rc4.ebuild
deleted file mode 100644
index 258e69804902..000000000000
--- a/app-cdr/k3b/k3b-1.0_rc4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_rc4.ebuild,v 1.1 2007/01/21 14:25:18 deathwing00 Exp $
-
-inherit kde eutils
-
-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"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa css dvdr dvdread encode ffmpeg flac hal kde mp3 musepack musicbrainz
-	sndfile vcd vorbis emovix"
-
-DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	hal? ( || ( dev-libs/dbus-qt3-old
-				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
-		sys-apps/hal )
-	media-libs/libsamplerate
-	media-libs/taglib
-	>=media-sound/cdparanoia-3.9.8
-	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
-	musepack? ( media-libs/libmpcdec )
-	vorbis? ( media-libs/libvorbis )
-	musicbrainz? ( media-libs/musicbrainz )
-	encode? ( media-sound/lame )
-	alsa? ( media-libs/alsa-lib )
-	dvdread? ( media-libs/libdvdread )"
-
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( >=app-cdr/dvd+rw-tools-7.0 )
-	css? ( media-libs/libdvdcss )
-	encode? ( media-sound/sox
-			  media-video/transcode )
-	vcd? ( media-video/vcdimager )
-	emovix? ( media-video/emovix )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-need-kde 3.2
-
-# The following commented lines will have to be uncommented once the final
-# release is done. This pre-release version does not support i18n.
-#I18N="${PN}-i18n-${PV}"
-
-# Supported languages and translated documentation
-#LANGS="af bg bn br bs ca cs cy da de el en_GB es et eu fr ga he hi hu is it ja km lt mk ms nb nds nl nn pa pl pt pt_BR ro ru se sl sr sr@Latn sv ta tr uk zh_CN"
-
-#for X in ${LANGS}; do
-#	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-#	IUSE="${IUSE} linguas_${X}"
-#done
-
-pkg_setup() {
-	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
-		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
-		eerror "but sys-apps/dbus is not built with Qt3 support."
-		die "Please, rebuild sys-apps/dbus with the \"qt3\" USE flag."
-	fi
-	if use encode && ! built_with_use media-video/transcode dvdread; then
-		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"encode\""
-		eerror "USE flag enabled, however media-video/transcode was not built"
-		eerror "with libdvdread support. Also keep in mind that enabling"
-		eerror "the dvdread USE flag will cause k3b to use libdvdread as well."
-		die "Please, rebuild media-video/transcode with the \"dvdread\" USE flag."
-	fi
-
-	kde_pkg_setup
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if [ -d "${WORKDIR}/${I18N}" ]; then
-		cd "${WORKDIR}/${I18N}"
-		for X in ${LANGS}; do
-			use linguas_${X} || rm -rf "${X}"
-		done
-		rm -f configure
-	fi
-
-	rm -f "${S}/configure"
-}
-
-src_compile() {
-	local myconf="--enable-libsuffix= 		\
-			--with-external-libsamplerate	\
-			--without-resmgr				\
-			$(use_with kde k3bsetup)		\
-			$(use_with hal)					\
-			$(use_with encode lame)			\
-			$(use_with ffmpeg)				\
-			$(use_with flac)				\
-			$(use_with vorbis oggvorbis)	\
-			$(use_with sndfile)				\
-			$(use_with mp3 libmad)			\
-			$(use_with musepack)			\
-			$(use_with musicbrainz)			\
-			$(use_with alsa)"
-
-	# Build process of K3b
-	kde_src_compile
-
-	# Build process of K3b-i18n
-#	if [ -d "${WORKDIR}/${I18N}" ]; then
-#		KDE_S="${WORKDIR}/${I18N}" \
-#		kde_src_compile
-#	fi
-}
-
-src_install() {
-	kde_src_install
-	dodoc FAQ KNOWNBUGS PERMISSIONS
-
-#	if [ -d "${WORKDIR}/${I18N}" ]; then
-#		KDE_S="${WORKDIR}/${I18N}" \
-#		kde_src_install
-#	fi
-
-	# Move menu entry
-	if use kde; then
-		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications/kde/
-	fi
-	rm -fR ${D}/usr/share/applnk/
-}
-
-pkg_postinst() {
-	echo
-	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
-	elog "Usually, it is sufficient to be in the cdrom group."
-	echo
-}