media-sound/gejengel: revbump to l-0.1.4-r2 fixing linking issue

patch supplied by Dustin Polke via the gentoo bug and set as proxy maintainer
under the proxy-maintainers herd in metadata, patch for submission upstream

Gentoo bug: #542708

Package-Manager: portage-2.2.20.1

3 files changed, 128 insertions, 2 deletions

diff --git a/media-sound/gejengel/files/0.1.4-flac_ln.patch b/media-sound/gejengel/files/0.1.4-flac_ln.patch
new file mode 100644
index 000000000000..2d4473e227a9
--- /dev/null
+++ b/media-sound/gejengel/files/0.1.4-flac_ln.patch
@@ -0,0 +1,42 @@
+Fixes Bug #542708
+The code uses functionality provided by libFLAC and libFLAC++ but only linked against libFLAC++.
+Included also is a check for libFLAC availability and added linking against libFLAC
+--- a/gejengel-0.1.4/configure.ac
++++ b/gejengel-0.1.4/configure.ac
+@@ -129,14 +129,20 @@ AC_ARG_ENABLE(flac,
+     [ enable_flac=$enableval ] )
+ 
+ if test "$enable_flac" != "no"; then
+-    PKG_CHECK_MODULES(FLAC, flac++, HAVE_FLAC=yes, HAVE_FLAC=no)
++    PKG_CHECK_MODULES(FLAC, flac, HAVE_FLAC=yes, HAVE_FLAC=no)
+     if test $HAVE_FLAC = yes; then
+-        AC_DEFINE(HAVE_FLAC, [1], Flac support enabled)
+-        AC_SUBST(FLAC_CFLAGS)
+-        AC_SUBST(FLAC_LIBS)
++	AC_DEFINE(HAVE_FLAC, [1], Flac found)
++	AC_SUBST(FLAC_CFLAGS)
++	AC_SUBST(FLAC_LIBS)
++        PKG_CHECK_MODULES(FLACPP, flac++, HAVE_FLACPP=yes, HAVE_FLACPP=no)
++        if test $HAVE_FLACPP = yes; then
++            AC_DEFINE(HAVE_FLACPP, [1], Flac support enabled)
++            AC_SUBST(FLACPP_CFLAGS)
++            AC_SUBST(FLACPP_LIBS)
++        fi
+     fi
+ fi
+-AM_CONDITIONAL(FLAC, test "$HAVE_FLAC" = "yes")
++AM_CONDITIONAL(FLAC, test "$HAVE_FLACPP" = "yes")
+ 
+ ########################################################################
+ # Mad
+--- a/gejengel-0.1.4/Makefile.am
++++ b/gejengel-0.1.4/Makefile.am
+@@ -256,7 +256,7 @@ libgejengel_la_LIBADD = libutils.la \
+                         libmusiclibrary.la \
+                         libcore.la \
+                         libplugins.la -lpthread \
+-                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
++                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLACPP_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
+ 
+ bin_PROGRAMS = gejengel
+ 
diff --git a/media-sound/gejengel/gejengel-0.1.4-r2.ebuild b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
new file mode 100644
index 000000000000..c49ab01b64d6
--- /dev/null
+++ b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils multilib flag-o-matic
+
+DESCRIPTION="Lightweight audio player"
+HOMEPAGE="https://github.com/dirkvdb/gejengel"
+SRC_URI="https://${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"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-cpp/pangomm:1.4
+	media-libs/taglib
+	dev-db/sqlite:3
+	|| ( media-gfx/imagemagick[cxx]
+	media-gfx/graphicsmagick[imagemagick] )
+	mad? ( media-libs/libmad )
+	flac? ( media-libs/flac[cxx] )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
+	audioscrobbler? ( >=media-libs/lastfmlib-0.4 )
+	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
+	dev-util/intltool
+	>=sys-devel/automake-1.11"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg-1.patch \
+		"${FILESDIR}"/${P}-libav9.patch \
+		"${FILESDIR}"/${P}-ffmpeg2.patch \
+		"${FILESDIR}"/${PV}-flac_ln.patch
+
+	# Remove Vesion and Encoding from the desktop file
+	sed -i -e "/Version/d" -e "/Encoding/d" \
+		data/${PN}.desktop.in || die "sed failed"
+	append-cxxflags "-D__STDC_CONSTANT_MACROS"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--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_compile() {
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	default
+	# The libgejengel.a is used by the package when building but shouldn't end
+	# up in the installation target
+	rm -f "${ED}"usr/$(get_libdir)/libgejengel.{a,la}
+}
diff --git a/media-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
index b6d93507fdf1..850d42a5998e 100644
--- a/media-sound/gejengel/metadata.xml
+++ b/media-sound/gejengel/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+	<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>DuPol@gmx.de</email>
+                <name>Dustin Polke</name>
+                <description>Proxy maintainer, to be assigned bugs</description>
 	</maintainer>
 	<use>
 		<flag name="audioscrobbler">Enable track submission on last.fm</flag>