Version bump.

(Portage version: 2.1.3.4)

6 files changed, 97 insertions, 11 deletions

diff --git a/media-sound/cantus/ChangeLog b/media-sound/cantus/ChangeLog
index 989842613ed0..176f48b23199 100644
--- a/media-sound/cantus/ChangeLog
+++ b/media-sound/cantus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/cantus
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/ChangeLog,v 1.22 2007/02/22 00:51:34 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/ChangeLog,v 1.23 2007/08/12 10:29:35 drac Exp $
+
+*cantus-3.0.2 (12 Aug 2007)
+
+  12 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/cantus-3.0.2-segfault.patch, cantus-1.99.9.ebuild,
+  +cantus-3.0.2.ebuild, cantus-20060206.ebuild:
+  Version bump.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-sound/cantus/cantus-1.99.9.ebuild b/media-sound/cantus/cantus-1.99.9.ebuild
index 44789a766988..791092196d1a 100644
--- a/media-sound/cantus/cantus-1.99.9.ebuild
+++ b/media-sound/cantus/cantus-1.99.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.99.9.ebuild,v 1.13 2006/10/28 01:39:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.99.9.ebuild,v 1.14 2007/08/12 10:29:35 drac Exp $
 
 IUSE="vorbis"
 
@@ -9,8 +9,8 @@ HOMEPAGE="http://www.debain.org/?session=&site=project&project=3"
 SRC_URI="http://sam.homeunix.com/software.manicsadness.com-step4/releases/cantus_2/${PN}_2-${PV}-1.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~ppc sparc x86"
+SLOT="0"
+KEYWORDS="amd64 x86"
 
 RDEPEND="vorbis? ( media-libs/libvorbis media-libs/libogg )
 	>=x11-libs/gtk+-2.2
diff --git a/media-sound/cantus/cantus-20060206.ebuild b/media-sound/cantus/cantus-20060206.ebuild
index f674d77b9b46..cb380f805590 100644
--- a/media-sound/cantus/cantus-20060206.ebuild
+++ b/media-sound/cantus/cantus-20060206.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-20060206.ebuild,v 1.6 2006/10/28 01:39:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-20060206.ebuild,v 1.7 2007/08/12 10:29:35 drac Exp $
 
 inherit eutils multilib
 
 DESCRIPTION="Easy to use tool for tagging and renaming MP3 and OGG/Vorbis files"
 HOMEPAGE="http://www.debain.org/software/cantus/"
-
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
-
+SLOT="0"
+KEYWORDS="sparc"
 IUSE=""
 
 RDEPEND="media-libs/libvorbis
diff --git a/media-sound/cantus/cantus-3.0.2.ebuild b/media-sound/cantus/cantus-3.0.2.ebuild
new file mode 100644
index 000000000000..44f1b796784e
--- /dev/null
+++ b/media-sound/cantus/cantus-3.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-3.0.2.ebuild,v 1.1 2007/08/12 10:29:35 drac Exp $
+
+inherit autotools eutils
+
+MY_P=${P}-testing
+
+DESCRIPTION="Application for tagging and renaming audio files."
+HOMEPAGE="http://cantus.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.12.11
+	>=dev-cpp/gtkmm-2.10
+	>=dev-cpp/libglademm-2.6.3
+	>=dev-libs/libsigc++-2.0.17
+	media-libs/libvorbis
+	media-libs/libogg"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-segfault.patch
+	eautoconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	newicon dist/pixmaps/${PN}_tag.png ${PN}.png
+	make_desktop_entry ${PN} Cantus ${PN}.png
+}
diff --git a/media-sound/cantus/files/cantus-3.0.2-segfault.patch b/media-sound/cantus/files/cantus-3.0.2-segfault.patch
new file mode 100644
index 000000000000..faf9a6f8be6e
--- /dev/null
+++ b/media-sound/cantus/files/cantus-3.0.2-segfault.patch
@@ -0,0 +1,35 @@
+diff -ur cantus-3.0.2-testing.orig/configure.ac cantus-3.0.2-testing/configure.ac
+--- cantus-3.0.2-testing.orig/configure.ac	2007-07-27 23:48:43.000000000 +0300
++++ cantus-3.0.2-testing/configure.ac	2007-08-12 12:46:58.000000000 +0300
+@@ -166,18 +166,6 @@
+ #
+ echo 
+ echo $PACKAGE $VERSION
+-echo
+-echo
+-echo Build with MP3 support........... : yes
+-echo Build with Ogg support........... : no
+-echo
+-echo Plugins which will be compiled... : id3v1,id3v2,id3copier,vorbis,mpegheader,tag2filename
+-echo
+-echo Print debugging messages......... : $enable_debug
+-echo 
+-echo Build for cpu architecture....... : $build_cpu
+-echo Build for operating system....... : $build_os
+-echo 
+ echo 
+ eval eval echo Cantus binaries will be installed in $bindir.
+ eval eval echo Cantus libraries will be installed in $libdir.
+diff -ur cantus-3.0.2-testing.orig/source/cantus/gui_controller.cc cantus-3.0.2-testing/source/cantus/gui_controller.cc
+--- cantus-3.0.2-testing.orig/source/cantus/gui_controller.cc	2007-07-27 01:40:01.000000000 +0300
++++ cantus-3.0.2-testing/source/cantus/gui_controller.cc	2007-08-12 13:01:27.000000000 +0300
+@@ -85,8 +85,7 @@
+  ******************************************************************************/
+ void GUIController::init(void)
+ {
+-  preferences = new PreferencesWindow(PACKAGE_LIB_DIR "cantus-3.glade",
+-                                      "preferences");
++  preferences = new PreferencesWindow( PACKAGE_DATA_DIR "/cantus/glade/cantus.glade", "preferences" );
+   preferences->signal_preference_changed.connect(
+      sigc::mem_fun(*this, &GUIController::on_preferences_preference_changed));
+ }
diff --git a/media-sound/cantus/files/digest-cantus-3.0.2 b/media-sound/cantus/files/digest-cantus-3.0.2
new file mode 100644
index 000000000000..648d8c98e06f
--- /dev/null
+++ b/media-sound/cantus/files/digest-cantus-3.0.2
@@ -0,0 +1,3 @@
+MD5 f1380ed6a4e772310b185ff89245635b cantus-3.0.2-testing.src.tar.gz 511104
+RMD160 d009bc86228a3e554a0c8558e5e92ed2d55c9bf5 cantus-3.0.2-testing.src.tar.gz 511104
+SHA256 0ea294dfd684142400fe179c5da9bd9ffc8716c01f60216cd55be5731d663c16 cantus-3.0.2-testing.src.tar.gz 511104