Version bump. Fixes bug #299349 as well

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 108 insertions, 4 deletions

diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog
index 8860f459eac1..688f6cebf931 100644
--- a/media-sound/gejengel/ChangeLog
+++ b/media-sound/gejengel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/gejengel
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.5 2009/10/02 14:38:11 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.6 2010/01/15 17:15:37 hwoarang Exp $
+
+*gejengel-0.1.2 (15 Jan 2010)
+
+  15 Jan 2010; <hwoarang@gentoo.org> gejengel-0.1.0.ebuild,
+  +gejengel-0.1.2.ebuild, +files/gejengel-0.1.2_64bit_fix.patch:
+  Version bump. Fixes bug #299349 as well
 
   02 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> gejengel-0.1.0.ebuild:
   Don't install .a and .la files #281385.
diff --git a/media-sound/gejengel/files/gejengel-0.1.2_64bit_fix.patch b/media-sound/gejengel/files/gejengel-0.1.2_64bit_fix.patch
new file mode 100644
index 000000000000..b4ac73095a86
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.2_64bit_fix.patch
@@ -0,0 +1,36 @@
+Index: src/ui/trackview.cpp
+===================================================================
+--- src/ui/trackview.cpp	(revision 409)
++++ src/ui/trackview.cpp	(revision 410)
+@@ -148,17 +148,17 @@
+         }
+         
+         Gtk::TreeViewColumn* pCol = m_TreeView.get_column(i);
+-        ss << reinterpret_cast<int>(pCol->property_user_data().get_value());
++        ss << reinterpret_cast<int64_t>(pCol->property_user_data().get_value());
+     }
+     
+     m_Settings.set("TrackViewColumns", ss.str());
+     
+-    int sortId;
++    int32_t sortId;
+     Gtk::SortType sortOrder;
+     m_TrackModel.getSortColumn(sortId, sortOrder);
+     
+     m_Settings.set("TrackViewSortColumnId", sortId);
+-    m_Settings.set("TrackViewSortColumnOrder", static_cast<int>(sortOrder));
++    m_Settings.set("TrackViewSortColumnOrder", static_cast<int32_t>(sortOrder));
+ }
+ 
+ bool TrackView::onButtonPress(GdkEventButton* pEvent)
+@@ -280,8 +280,8 @@
+     std::vector<Gtk::TreeViewColumn*> columns = m_TreeView.get_columns();
+     for (size_t i = 0; i < columns.size(); ++i)
+     {
+-        int32_t id = reinterpret_cast<int32_t>(m_TreeView.get_column(i)->property_user_data().get_value());
+-        if (id == headerId)
++        int64_t id = reinterpret_cast<int64_t>(m_TreeView.get_column(i)->property_user_data().get_value());
++        if (static_cast<int32_t>(id) == headerId)
+         {
+             pColToRemove = m_TreeView.get_column(i);
+             break;
diff --git a/media-sound/gejengel/gejengel-0.1.0.ebuild b/media-sound/gejengel/gejengel-0.1.0.ebuild
index a172f42a19bf..014302fe4fb9 100644
--- a/media-sound/gejengel/gejengel-0.1.0.ebuild
+++ b/media-sound/gejengel/gejengel-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.0.ebuild,v 1.8 2010/01/05 14:51:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.0.ebuild,v 1.9 2010/01/15 17:15:37 hwoarang Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog test"
+IUSE="+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog test"
 
 RDEPEND=">=dev-cpp/gtkmm-2.16
 	>=dev-cpp/pangomm-2.24
diff --git a/media-sound/gejengel/gejengel-0.1.2.ebuild b/media-sound/gejengel/gejengel-0.1.2.ebuild
new file mode 100644
index 000000000000..f6685418cc70
--- /dev/null
+++ b/media-sound/gejengel/gejengel-0.1.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.2.ebuild,v 1.1 2010/01/15 17:15:37 hwoarang Exp $
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="Lightweight audio player"
+HOMEPAGE="http://code.google.com/p/gejengel"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog test"
+
+RDEPEND=">=dev-cpp/gtkmm-2.16
+	>=dev-cpp/pangomm-2.24
+	dev-cpp/libsexymm
+	media-libs/taglib
+	dev-db/sqlite
+	media-gfx/imagemagick[-nocxx]
+	mad? ( media-libs/libmad )
+	flac? ( media-libs/flac[cxx] )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070330 )
+	audioscrobbler? ( <media-libs/lastfmlib-0.3.1 )
+	dbus? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	openal? ( media-libs/openal )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	dev-libs/libxdg-basedir
+	>=sys-devel/automake-1.11"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}_64bit_fix.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-shared \
+		$(use_enable syslog logging) \
+		$(use_enable debug) \
+		$(use_enable openal) \
+		$(use_enable audioscrobbler lastfm) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		$(use_enable mad) \
+		$(use_enable flac) \
+		$(use_enable ffmpeg) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		--disable-unittests
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+	rm -f "${D}"/usr/$(get_libdir)/libgejengel.{a,la}
+}