1 |
commit: 390545adff45dcbe3404c2a3922dccaa3fa74ade |
2 |
Author: Sergiy Borodych <Sergiy.Borodych <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Feb 13 15:49:22 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 14 21:43:59 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390545ad |
7 |
|
8 |
media-sound/gmusicbrowser: drop gstreamer-0 support |
9 |
|
10 |
close bug #604684 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/3955 |
12 |
|
13 |
...-9999.ebuild => gmusicbrowser-1.1.15-r3.ebuild} | 25 ++++++---------------- |
14 |
.../gmusicbrowser/gmusicbrowser-9999.ebuild | 12 +++-------- |
15 |
2 files changed, 10 insertions(+), 27 deletions(-) |
16 |
|
17 |
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild |
18 |
similarity index 70% |
19 |
copy from media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild |
20 |
copy to media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild |
21 |
index c2c17f37ff..6a5db39411 100644 |
22 |
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild |
23 |
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild |
24 |
@@ -1,25 +1,21 @@ |
25 |
-# Copyright 1999-2016 Gentoo Foundation |
26 |
+# Copyright 1999-2017 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
# $Id$ |
29 |
|
30 |
EAPI=6 |
31 |
|
32 |
-inherit eutils fdo-mime git-r3 gnome2-utils |
33 |
+inherit fdo-mime gnome2-utils |
34 |
|
35 |
DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files" |
36 |
HOMEPAGE="http://gmusicbrowser.org/" |
37 |
-EGIT_REPO_URI="git://github.com/squentin/${PN}.git" |
38 |
+SRC_URI="http://${PN}.org/download/${P}.tar.gz" |
39 |
|
40 |
LICENSE="GPL-3" |
41 |
SLOT="0" |
42 |
-KEYWORDS="" |
43 |
-IUSE="dbus doc extras gstreamer gstreamer-0 libnotify mplayer" |
44 |
+KEYWORDS="~amd64 ~x86" |
45 |
+IUSE="dbus doc extras gstreamer libnotify mplayer" |
46 |
|
47 |
GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection" |
48 |
-GSTREAMER0_DEPEND=" |
49 |
- dev-perl/GStreamer |
50 |
- dev-perl/GStreamer-Interfaces |
51 |
- media-plugins/gst-plugins-meta:0.10" |
52 |
MPLAYER_DEPEND="media-video/mplayer" |
53 |
MPV_DEPEND="media-video/mpv" |
54 |
OTHER_DEPEND=" |
55 |
@@ -34,17 +30,11 @@ RDEPEND="dev-lang/perl |
56 |
|| ( net-misc/wget dev-perl/AnyEvent-HTTP ) |
57 |
dbus? ( dev-perl/Net-DBus ) |
58 |
gstreamer? ( ${GSTREAMER_DEPEND} ) |
59 |
- gstreamer-0? ( ${GSTREAMER0_DEPEND} ) |
60 |
mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) ) |
61 |
- !gstreamer? ( !gstreamer-0? ( !mplayer? ( ${OTHER_DEPEND} ) ) ) |
62 |
+ !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) ) |
63 |
extras? ( dev-perl/gnome2-wnck ) |
64 |
libnotify? ( dev-perl/Gtk2-Notify )" |
65 |
-DEPEND="sys-devel/gettext |
66 |
- doc? ( dev-perl/Text-Markdown )" |
67 |
- |
68 |
-src_compile() { |
69 |
- emake MARKDOWN=$(usex doc "Markdown.pl" "echo") |
70 |
-} |
71 |
+DEPEND="sys-devel/gettext" |
72 |
|
73 |
src_install() { |
74 |
emake \ |
75 |
@@ -67,7 +57,6 @@ pkg_postinst() { |
76 |
elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..." |
77 |
elog "for audio playback. Needed dependencies:" |
78 |
elog " Gstreamer: ${GSTREAMER_DEPEND}" |
79 |
- elog " Gstreamer-0.10: ${GSTREAMER0_DEPEND}" |
80 |
elog " mplayer: ${MPLAYER_DEPEND}" |
81 |
elog " mpv: ${MPV_DEPEND}" |
82 |
elog " mpg123/ogg123...: ${OTHER_DEPEND}" |
83 |
|
84 |
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild |
85 |
index c2c17f37ff..ad13158cc9 100644 |
86 |
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild |
87 |
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild |
88 |
@@ -1,4 +1,4 @@ |
89 |
-# Copyright 1999-2016 Gentoo Foundation |
90 |
+# Copyright 1999-2017 Gentoo Foundation |
91 |
# Distributed under the terms of the GNU General Public License v2 |
92 |
# $Id$ |
93 |
|
94 |
@@ -13,13 +13,9 @@ EGIT_REPO_URI="git://github.com/squentin/${PN}.git" |
95 |
LICENSE="GPL-3" |
96 |
SLOT="0" |
97 |
KEYWORDS="" |
98 |
-IUSE="dbus doc extras gstreamer gstreamer-0 libnotify mplayer" |
99 |
+IUSE="dbus doc extras gstreamer libnotify mplayer" |
100 |
|
101 |
GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection" |
102 |
-GSTREAMER0_DEPEND=" |
103 |
- dev-perl/GStreamer |
104 |
- dev-perl/GStreamer-Interfaces |
105 |
- media-plugins/gst-plugins-meta:0.10" |
106 |
MPLAYER_DEPEND="media-video/mplayer" |
107 |
MPV_DEPEND="media-video/mpv" |
108 |
OTHER_DEPEND=" |
109 |
@@ -34,9 +30,8 @@ RDEPEND="dev-lang/perl |
110 |
|| ( net-misc/wget dev-perl/AnyEvent-HTTP ) |
111 |
dbus? ( dev-perl/Net-DBus ) |
112 |
gstreamer? ( ${GSTREAMER_DEPEND} ) |
113 |
- gstreamer-0? ( ${GSTREAMER0_DEPEND} ) |
114 |
mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) ) |
115 |
- !gstreamer? ( !gstreamer-0? ( !mplayer? ( ${OTHER_DEPEND} ) ) ) |
116 |
+ !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) ) |
117 |
extras? ( dev-perl/gnome2-wnck ) |
118 |
libnotify? ( dev-perl/Gtk2-Notify )" |
119 |
DEPEND="sys-devel/gettext |
120 |
@@ -67,7 +62,6 @@ pkg_postinst() { |
121 |
elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..." |
122 |
elog "for audio playback. Needed dependencies:" |
123 |
elog " Gstreamer: ${GSTREAMER_DEPEND}" |
124 |
- elog " Gstreamer-0.10: ${GSTREAMER0_DEPEND}" |
125 |
elog " mplayer: ${MPLAYER_DEPEND}" |
126 |
elog " mpv: ${MPV_DEPEND}" |
127 |
elog " mpg123/ogg123...: ${OTHER_DEPEND}" |