* [gentoo-commits] repo/gentoo:master commit in: media-sound/muse/, media-sound/muse/files/
@ 2016-10-02 14:49 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-10-02 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 2d7a071631c824c735a66dd361d1565d045b1b90
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 14:46:44 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 14:46:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7a0716
media-sound/muse: Remove EAPI=2 ebuild
Package-Manager: portage-2.3.1
media-sound/muse/Manifest | 1 -
media-sound/muse/files/muse-0.9.2-asneeded.patch | 12 ------
media-sound/muse/files/muse-0.9.2-gcc43.patch | 16 --------
media-sound/muse/muse-0.9.2.ebuild | 50 ------------------------
4 files changed, 79 deletions(-)
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index 46a9484..31599ec 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,2 +1 @@
-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-asneeded.patch b/media-sound/muse/files/muse-0.9.2-asneeded.patch
deleted file mode 100644
index 70674bb..00000000
--- a/media-sound/muse/files/muse-0.9.2-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- MuSE-0.9.2/src/Makefile.in.old 2006-11-12 20:22:22.000000000 +0100
-+++ MuSE-0.9.2/src/Makefile.in 2006-11-12 20:22:36.000000000 +0100
-@@ -274,7 +274,8 @@
- @OGG_LIBS@ \
- @VORBIS_LIBS@ \
- @GUI_LIBS@ \
-- @SNDFILE_LIBS@
-+ @SNDFILE_LIBS@ \
-+ @GTK2_LIBS@
-
- all: all-recursive
-
diff --git a/media-sound/muse/files/muse-0.9.2-gcc43.patch b/media-sound/muse/files/muse-0.9.2-gcc43.patch
deleted file mode 100644
index ec58eac..00000000
--- a/media-sound/muse/files/muse-0.9.2-gcc43.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 MuSE-0.9.2.orig/src/libmpeg/mpegtoraw.cc MuSE-0.9.2/src/libmpeg/mpegtoraw.cc
---- MuSE-0.9.2.orig/src/libmpeg/mpegtoraw.cc 2008-04-22 20:39:47.000000000 +0200
-+++ MuSE-0.9.2/src/libmpeg/mpegtoraw.cc 2008-04-22 20:53:44.000000000 +0200
-@@ -417,11 +417,11 @@
- if(loader->eof())return seterrorcode(SOUND_ERROR_FINISH);
-
- return true;
- }
-
--#include <iostream.h>
-+#include <iostream>
- // Convert mpeg to raw
- bool Mpegtoraw::run(int frames) {
- clearrawdata();
- if(frames<0)lastfrequency=0;
-
diff --git a/media-sound/muse/muse-0.9.2.ebuild b/media-sound/muse/muse-0.9.2.ebuild
deleted file mode 100644
index 09fb0f8..00000000
--- a/media-sound/muse/muse-0.9.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils
-
-MY_P=${P/muse/MuSE}
-
-DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
-HOMEPAGE="http://muse.dyne.org"
-SRC_URI="ftp://ftp.dyne.org/muse/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="debug gtk"
-
-RDEPEND="media-sound/lame
- media-libs/libvorbis
- media-libs/libsndfile
- media-libs/libogg
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-asneeded.patch \
- "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable gtk gtk2)
-}
-
-src_compile() {
- emake CXXFLAGS="${CXXFLAGS} -fpermissive" CFLAGS="${CFLAGS}" \
- || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" docsdir="/usr/share/doc/${PF}" \
- install || die "emake install failed."
- prepalldocs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/muse/, media-sound/muse/files/
@ 2020-06-21 13:21 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-06-21 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 618321b34f69fafa76cdc9fa4bb18ce5bf76d73f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 13:19:46 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 13:19:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618321b3
media-sound/muse: [QA] Add AM_PROG_AR
Closes: https://bugs.gentoo.org/724712
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/muse-0.9.2_p20161002-fix-build-system.patch | 14 +++++++++++---
media-sound/muse/muse-0.9.2_p20161002.ebuild | 19 +++++++++----------
2 files changed, 20 insertions(+), 13 deletions(-)
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
index 7ca30e6da68..456dca9b9de 100644
--- 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
@@ -20,7 +20,15 @@ Fix build system to properly install files and prevent underlinking.
dnl ==============================================================
-@@ -178,19 +178,12 @@
+@@ -67,6 +67,7 @@
+ AC_PROG_CPP
+ AC_SEARCH_LIBS([strerror],[cposix])
+ AC_PROG_RANLIB
++AM_PROG_AR
+
+
+ dnl ==============================================================
+@@ -178,19 +179,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
@@ -46,7 +54,7 @@ Fix build system to properly install files and prevent underlinking.
if test x$have_ncurses_h = xyes; then
AC_DEFINE([GUI_RUBIK], 1, [Have ncurses GUI])
-@@ -326,8 +319,13 @@
+@@ -326,8 +320,13 @@
dnl documentation
@@ -62,7 +70,7 @@ Fix build system to properly install files and prevent underlinking.
dnl ==============================================================
-@@ -402,6 +400,7 @@
+@@ -402,6 +401,7 @@
AC_CONFIG_FILES([
Makefile
diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild
index 89771e22774..e296b01d658 100644
--- a/media-sound/muse/muse-0.9.2_p20161002.ebuild
+++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -14,24 +14,23 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="doc gtk jack ncurses portaudio"
-RDEPEND="media-sound/lame
+RDEPEND="
+ media-sound/lame
media-libs/libvorbis
- media-libs/libsndfile
+ 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}
+ portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-21 13:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-21 13:21 [gentoo-commits] repo/gentoo:master commit in: media-sound/muse/, media-sound/muse/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2016-10-02 14:49 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox