[gentoo-commits] repo/gentoo:master commit in: media-sound/muse/files/, media-sound/muse/

[David Seifert]

commit:     145872eb842cd57df97b57516f2fd844f4ac86c8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 14:32:13 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 14:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145872eb

media-sound/muse: Version bump using git snapshot

Gentoo-bug: 587270, 594782
* EAPI=6

Package-Manager: portage-2.3.1

 media-sound/muse/Manifest                          |  1 +
 .../muse-0.9.2_p20161002-fix-build-system.patch    | 95 ++++++++++++++++++++++
 media-sound/muse/muse-0.9.2_p20161002.ebuild       | 52 ++++++++++++
 3 files changed, 148 insertions(+)

diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index a27e50c..46a9484 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1 +1,2 @@
 DIST MuSE-0.9.2.tar.gz 1420411 SHA256 270f95b3a4f9d11bea04d5db4b3868aee1fa78177da0b5d9a74f26c4cfa5e197 SHA512 820dabe39021ff5d5b351c954ef1e497ba89c127589ab46ad7e5f82f86a3dad3d6016fdf90450dc706e8f46d819b466d7044304f7144d62e43c0d732b52c8967 WHIRLPOOL 343ef56fe6472f6491fbdcc1bb291845eac601aa8b3d4d4ca75f261645a4818a613a692983312a9c705e13f6e7105fc3a98cd85118b482280d680e64ebc679d5
+DIST muse-0.9.2_p20161002.tar.gz 996253 SHA256 a43b4ae25c9cf76bf9d4c8328179b0ca3178a0ae1c7b1b070b6fc50277179804 SHA512 7d5b35c64b1ccae14330bb35ba0e32661f6f7445055e1854c7e5e530a7645405da03836e919b6151872f254c754d99d045b9c80938148454f521d3d117332208 WHIRLPOOL 661bb81118d16875aacfac6db1ca6adeb1b9eb4373462b50ed6ae31c56a7e9d210b0376b4b0fcef804badb57d238c8c2f19ff388cdda182cccb41dd946dd52b9

diff --git a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
new file mode 100644
index 00000000..7ca30e6
--- /dev/null
+++ b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
@@ -0,0 +1,95 @@
+Fix build system to properly install files and prevent underlinking.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@
+ 
+ AC_CANONICAL_HOST
+ 
+-AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([src/muse.cpp])
+ 
+ dnl ==============================================================
+@@ -56,7 +56,7 @@
+ 
+ 
+ #GLOBAL_CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"
+-GLOBAL_CFLAGS="-pipe -D_REENTRANT -Wall"
++GLOBAL_CFLAGS="-D_REENTRANT -Wall"
+ 
+ 
+ dnl ==============================================================
+@@ -178,19 +178,12 @@
+ # this is really libcdk's configuration, needs to be reviewed if correct
+ # see src/ncursesgui/libcdk
+ if test x$want_ncurses_gui = xyes; then
+-  AC_CHECK_LIB(termcap, waddstr,
+-               [have_termcap=yes], [have_termcap=no])
+-
+-  AC_CHECK_LIB(ncurses, start_color,
+-               AC_DEFINE([HAVE_START_COLOR], 1, [Have start_color]))
+-
+-  AC_CHECK_LIB(ncurses, initscr,
+-               [have_ncurses=yes], [have_ncurses=no])
+-
+-  AC_CHECK_HEADERS([ncurses.h],
+-                   [have_ncurses_h=yes], [have_ncurses_h=no])
+-
+-  AC_CHECK_FUNC(XCursesExit, AC_DEFINE(HAVE_XCURSES, 1, [Build with xcurses]))
++  PKG_CHECK_MODULES([NCURSES], [ncurses], [
++    AC_DEFINE([HAVE_START_COLOR], 1, [Have start_color])
++    have_ncurses=yes
++    have_ncurses_h=yes
++    have_termcap=yes
++  ])
+ 
+   if test x$have_ncurses_h = xyes; then
+     AC_DEFINE([GUI_RUBIK], 1, [Have ncurses GUI])
+@@ -326,8 +319,13 @@
+ 
+ 
+ dnl documentation
+-AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
+-AM_CONDITIONAL(BUILD_DOC, [test -n "$DOXYGEN"])
++AC_ARG_ENABLE([doc],
++  AS_HELP_STRING([--enable-doc], [Enable building documentation using doxygen]))
++AS_IF([test "x$enable_doc" = "xyes"], [
++  dnl Enable doc building
++  AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
++])
++AM_CONDITIONAL(BUILD_DOC, [test "x$enable_doc" = "xyes"])
+ 
+ 
+ dnl ==============================================================
+@@ -402,6 +400,7 @@
+ 
+ AC_CONFIG_FILES([
+ Makefile
++src/ncursesgui/libcdk/Makefile
+ doc/muse.doxygen
+ ])
+ AC_OUTPUT
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,9 +4,6 @@
+ 
+ SUBDIRS = $(LIBCDKDIR)
+ 
+-dist_docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
+-docsdir = ${prefix}/share/doc/${PACKAGE}
+-
+ dist_man_MANS = doc/muse.1
+ 
+ ACLOCAL_AMFLAGS = -I m4
+@@ -71,7 +68,9 @@
+   $(SAMPLERATE_LIBS) \
+   $(SHOUT_LIBS) \
+   $(SNDFILE_LIBS) \
+-  $(VORBIS_LIBS)
++  $(VORBIS_LIBS) \
++  $(GTK2_LIBS) \
++  $(NCURSES_LIBS)
+ 
+ src_muse_DEPENDENCIES = \
+   $(GUI_OBJECTS)

diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild
new file mode 100644
index 00000000..2c90e0b
--- /dev/null
+++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
+HOMEPAGE="http://muse.dyne.org"
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc gtk jack ncurses portaudio"
+
+RDEPEND="media-sound/lame
+	media-libs/libvorbis
+	media-libs/libsndfile
+	media-libs/libogg
+	media-libs/libshout
+	media-libs/libsamplerate
+	gtk? ( x11-libs/gtk+:2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ncurses? ( sys-libs/ncurses:0= )
+	portaudio? ( media-libs/portaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-dmalloc \
+		--disable-profiling \
+		--disable-lubrify \
+		$(use_enable gtk gtk2) \
+		$(use_enable jack) \
+		$(use_enable ncurses) \
+		$(use_enable portaudio) \
+		$(use_enable doc)
+}