[gentoo-commits] repo/gentoo:master commit in: media-sound/gmusicbrowser/ - gentoo-commits

From:	"Miroslav Šulc" <fordfrog@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-sound/gmusicbrowser/
Date:	Wed, 25 Dec 2019 12:23:34
Message-Id:	`1577276604.dca2364c07a70fc6792ecc66128f3e73502e6cb4.fordfrog@gentoo`

1

commit:     dca2364c07a70fc6792ecc66128f3e73502e6cb4

2

Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>

3

AuthorDate: Wed Dec 25 12:22:01 2019 +0000

4

Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>

5

CommitDate: Wed Dec 25 12:23:24 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca2364c

7

8

media-sound/gmusicbrowser: 1.1.15_p20190315 and 9999 cleanup

9

10

1) eapi7

11

2) xdg-utils -> xdg

12

3) removed all unnecessary variables (they are used only once)

13

14

Package-Manager: Portage-2.3.83, Repoman-2.3.20

15

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

16

17

 .../gmusicbrowser-1.1.15_p20190315.ebuild          | 37 +++++++---------------

18

 .../gmusicbrowser/gmusicbrowser-9999.ebuild        | 37 +++++++---------------

19

 2 files changed, 24 insertions(+), 50 deletions(-)

20

21

diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild

22

index 168d43232cb..e3ecb295b17 100644

23

--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild

24

+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild

25

@@ -1,9 +1,9 @@

26

 # Copyright 1999-2019 Gentoo Authors

27

 # Distributed under the terms of the GNU General Public License v2

28

29

-EAPI=6

30

+EAPI=7

31

32

-inherit eutils gnome2-utils xdg-utils

33

+inherit eutils gnome2-utils xdg

34

35

 if [[ ${PV} == "9999" ]] ; then

36

 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"

37

@@ -24,23 +24,20 @@ LICENSE="GPL-3"

38

 SLOT="0"

39

 IUSE="dbus doc extras gstreamer libnotify mplayer"

40

41

-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"

42

-MPLAYER_DEPEND="media-video/mplayer"

43

-MPV_DEPEND="media-video/mpv"

44

-OTHER_DEPEND="

45

-	media-sound/alsa-utils

46

-	media-sound/flac123

47

-	|| ( media-sound/mpg123 media-sound/mpg321 )

48

-	media-sound/vorbis-tools"

49

-

50

 RDEPEND="dev-lang/perl

51

 	dev-perl/Gtk2

52

 	virtual/perl-MIME-Base64

53

 	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )

54

 	dbus? ( dev-perl/Net-DBus )

55

-	gstreamer? ( ${GSTREAMER_DEPEND} )

56

-	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )

57

-	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )

58

+	gstreamer? ( dev-perl/Glib-Object-Introspection )

59

+	mplayer? ( || ( media-video/mplayer media-video/mpv ) )

60

+	!gstreamer? ( !mplayer? (

61

+			media-sound/alsa-utils

62

+			media-sound/flac123

63

+			|| ( media-sound/mpg123 media-sound/mpg321 )

64

+			media-sound/vorbis-tools

65

+		)

66

+	)

67

 	extras? ( dev-perl/gnome2-wnck )

68

 	libnotify? ( dev-perl/Gtk2-Notify )"

69

 DEPEND="sys-devel/gettext

70

@@ -53,19 +50,9 @@ src_compile() {

71

 src_install() {

72

 	emake \

73

 		DESTDIR="${D}" \

74

-		iconsdir="${D%/}/usr/share/icons/hicolor" \

75

+		iconsdir="${D}/usr/share/icons/hicolor" \

76

 		install

77

78

 	use doc && local HTML_DOCS=( layout_doc.html )

79

 	einstalldocs

80

}

81

-

82

-pkg_postinst() {

83

-	xdg_desktop_database_update

84

-	gnome2_icon_cache_update

85

-}

86

-

87

-pkg_postrm() {

88

-	xdg_desktop_database_update

89

-	gnome2_icon_cache_update

90

-}

91

92

diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild

93

index 168d43232cb..e3ecb295b17 100644

94

--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild

95

+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild

96

@@ -1,9 +1,9 @@

97

 # Copyright 1999-2019 Gentoo Authors

98

 # Distributed under the terms of the GNU General Public License v2

99

100

-EAPI=6

101

+EAPI=7

102

103

-inherit eutils gnome2-utils xdg-utils

104

+inherit eutils gnome2-utils xdg

105

106

 if [[ ${PV} == "9999" ]] ; then

107

 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"

108

@@ -24,23 +24,20 @@ LICENSE="GPL-3"

109

 SLOT="0"

110

 IUSE="dbus doc extras gstreamer libnotify mplayer"

111

112

-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"

113

-MPLAYER_DEPEND="media-video/mplayer"

114

-MPV_DEPEND="media-video/mpv"

115

-OTHER_DEPEND="

116

-	media-sound/alsa-utils

117

-	media-sound/flac123

118

-	|| ( media-sound/mpg123 media-sound/mpg321 )

119

-	media-sound/vorbis-tools"

120

-

121

 RDEPEND="dev-lang/perl

122

 	dev-perl/Gtk2

123

 	virtual/perl-MIME-Base64

124

 	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )

125

 	dbus? ( dev-perl/Net-DBus )

126

-	gstreamer? ( ${GSTREAMER_DEPEND} )

127

-	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )

128

-	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )

129

+	gstreamer? ( dev-perl/Glib-Object-Introspection )

130

+	mplayer? ( || ( media-video/mplayer media-video/mpv ) )

131

+	!gstreamer? ( !mplayer? (

132

+			media-sound/alsa-utils

133

+			media-sound/flac123

134

+			|| ( media-sound/mpg123 media-sound/mpg321 )

135

+			media-sound/vorbis-tools

136

+		)

137

+	)

138

 	extras? ( dev-perl/gnome2-wnck )

139

 	libnotify? ( dev-perl/Gtk2-Notify )"

140

 DEPEND="sys-devel/gettext

141

@@ -53,19 +50,9 @@ src_compile() {

142

 src_install() {

143

 	emake \

144

 		DESTDIR="${D}" \

145

-		iconsdir="${D%/}/usr/share/icons/hicolor" \

146

+		iconsdir="${D}/usr/share/icons/hicolor" \

147

 		install

148

149

 	use doc && local HTML_DOCS=( layout_doc.html )

150

 	einstalldocs

151

}

152

-

153

-pkg_postinst() {

154

-	xdg_desktop_database_update

155

-	gnome2_icon_cache_update

156

-}

157

-

158

-pkg_postrm() {

159

-	xdg_desktop_database_update

160

-	gnome2_icon_cache_update

161

-}

1	commit: dca2364c07a70fc6792ecc66128f3e73502e6cb4
2	Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3	AuthorDate: Wed Dec 25 12:22:01 2019 +0000
4	Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5	CommitDate: Wed Dec 25 12:23:24 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca2364c
7
8	media-sound/gmusicbrowser: 1.1.15_p20190315 and 9999 cleanup
9
10	1) eapi7
11	2) xdg-utils -> xdg
12	3) removed all unnecessary variables (they are used only once)
13
14	Package-Manager: Portage-2.3.83, Repoman-2.3.20
15	Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
16
17	.../gmusicbrowser-1.1.15_p20190315.ebuild \| 37 +++++++---------------
18	.../gmusicbrowser/gmusicbrowser-9999.ebuild \| 37 +++++++---------------
19	2 files changed, 24 insertions(+), 50 deletions(-)
20
21	diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
22	index 168d43232cb..e3ecb295b17 100644
23	--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
24	+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
25	@@ -1,9 +1,9 @@
26	# Copyright 1999-2019 Gentoo Authors
27	# Distributed under the terms of the GNU General Public License v2
28
29	-EAPI=6
30	+EAPI=7
31
32	-inherit eutils gnome2-utils xdg-utils
33	+inherit eutils gnome2-utils xdg
34
35	if [[ ${PV} == "9999" ]] ; then
36	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
37	@@ -24,23 +24,20 @@ LICENSE="GPL-3"
38	SLOT="0"
39	IUSE="dbus doc extras gstreamer libnotify mplayer"
40
41	-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
42	-MPLAYER_DEPEND="media-video/mplayer"
43	-MPV_DEPEND="media-video/mpv"
44	-OTHER_DEPEND="
45	- media-sound/alsa-utils
46	- media-sound/flac123
47	- \|\| ( media-sound/mpg123 media-sound/mpg321 )
48	- media-sound/vorbis-tools"
49	-
50	RDEPEND="dev-lang/perl
51	dev-perl/Gtk2
52	virtual/perl-MIME-Base64
53	\|\| ( net-misc/wget dev-perl/AnyEvent-HTTP )
54	dbus? ( dev-perl/Net-DBus )
55	- gstreamer? ( ${GSTREAMER_DEPEND} )
56	- mplayer? ( \|\| ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
57	- !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
58	+ gstreamer? ( dev-perl/Glib-Object-Introspection )
59	+ mplayer? ( \|\| ( media-video/mplayer media-video/mpv ) )
60	+ !gstreamer? ( !mplayer? (
61	+ media-sound/alsa-utils
62	+ media-sound/flac123
63	+ \|\| ( media-sound/mpg123 media-sound/mpg321 )
64	+ media-sound/vorbis-tools
65	+ )
66	+ )
67	extras? ( dev-perl/gnome2-wnck )
68	libnotify? ( dev-perl/Gtk2-Notify )"
69	DEPEND="sys-devel/gettext
70	@@ -53,19 +50,9 @@ src_compile() {
71	src_install() {
72	emake \
73	DESTDIR="${D}" \
74	- iconsdir="${D%/}/usr/share/icons/hicolor" \
75	+ iconsdir="${D}/usr/share/icons/hicolor" \
76	install
77
78	use doc && local HTML_DOCS=( layout_doc.html )
79	einstalldocs
80	}
81	-
82	-pkg_postinst() {
83	- xdg_desktop_database_update
84	- gnome2_icon_cache_update
85	-}
86	-
87	-pkg_postrm() {
88	- xdg_desktop_database_update
89	- gnome2_icon_cache_update
90	-}
91
92	diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
93	index 168d43232cb..e3ecb295b17 100644
94	--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
95	+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
96	@@ -1,9 +1,9 @@
97	# Copyright 1999-2019 Gentoo Authors
98	# Distributed under the terms of the GNU General Public License v2
99
100	-EAPI=6
101	+EAPI=7
102
103	-inherit eutils gnome2-utils xdg-utils
104	+inherit eutils gnome2-utils xdg
105
106	if [[ ${PV} == "9999" ]] ; then
107	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
108	@@ -24,23 +24,20 @@ LICENSE="GPL-3"
109	SLOT="0"
110	IUSE="dbus doc extras gstreamer libnotify mplayer"
111
112	-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
113	-MPLAYER_DEPEND="media-video/mplayer"
114	-MPV_DEPEND="media-video/mpv"
115	-OTHER_DEPEND="
116	- media-sound/alsa-utils
117	- media-sound/flac123
118	- \|\| ( media-sound/mpg123 media-sound/mpg321 )
119	- media-sound/vorbis-tools"
120	-
121	RDEPEND="dev-lang/perl
122	dev-perl/Gtk2
123	virtual/perl-MIME-Base64
124	\|\| ( net-misc/wget dev-perl/AnyEvent-HTTP )
125	dbus? ( dev-perl/Net-DBus )
126	- gstreamer? ( ${GSTREAMER_DEPEND} )
127	- mplayer? ( \|\| ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
128	- !gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
129	+ gstreamer? ( dev-perl/Glib-Object-Introspection )
130	+ mplayer? ( \|\| ( media-video/mplayer media-video/mpv ) )
131	+ !gstreamer? ( !mplayer? (
132	+ media-sound/alsa-utils
133	+ media-sound/flac123
134	+ \|\| ( media-sound/mpg123 media-sound/mpg321 )
135	+ media-sound/vorbis-tools
136	+ )
137	+ )
138	extras? ( dev-perl/gnome2-wnck )
139	libnotify? ( dev-perl/Gtk2-Notify )"
140	DEPEND="sys-devel/gettext
141	@@ -53,19 +50,9 @@ src_compile() {
142	src_install() {
143	emake \
144	DESTDIR="${D}" \
145	- iconsdir="${D%/}/usr/share/icons/hicolor" \
146	+ iconsdir="${D}/usr/share/icons/hicolor" \
147	install
148
149	use doc && local HTML_DOCS=( layout_doc.html )
150	einstalldocs
151	}
152	-
153	-pkg_postinst() {
154	- xdg_desktop_database_update
155	- gnome2_icon_cache_update
156	-}
157	-
158	-pkg_postrm() {
159	- xdg_desktop_database_update
160	- gnome2_icon_cache_update
161	-}

Gentoo Archives: gentoo-commits