[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/ - gentoo-commits

From:	"Jörg Bornkessel" <hd_brummy@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/
Date:	Sun, 12 Jan 2020 17:56:38
Message-Id:	`1578851750.266094f907e43692b5dcf40b9ad57c64a1f65564.hd_brummy@gentoo`

1

commit:     266094f907e43692b5dcf40b9ad57c64a1f65564

2

Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jan 12 17:42:11 2020 +0000

4

Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>

5

CommitDate: Sun Jan 12 17:55:50 2020 +0000

6

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

7

8

media-plugins/vdr-epgsearch: license fixed, added missing die's

9

10

Package-Manager: Portage-2.3.84, Repoman-2.3.20

11

Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

12

13

 .../vdr-epgsearch-1.0.1_p20141227-r1.ebuild              |  4 ++--

14

 media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild   | 16 ++++++++--------

15

 media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild   | 16 ++++++++--------

16

 .../vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild   |  2 +-

17

 4 files changed, 19 insertions(+), 19 deletions(-)

18

19

diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild

20

index c79abd511d1..0917f4f8da5 100644

21

--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild

22

+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild

23

@@ -1,4 +1,4 @@

24

-# Copyright 2019 Gentoo Authors

25

+# Copyright 2020 Gentoo Authors

26

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

27

28

 EAPI=6

29

@@ -26,7 +26,7 @@ case ${P#*_} in

30

;;

31

 esac

32

33

-LICENSE="GPL-2"

34

+LICENSE="GPL-2+"

35

 SLOT="0"

36

 KEYWORDS="amd64 x86"

37

 IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre"

38

39

diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild

40

index 036df79eeb1..ba0700f4113 100644

41

--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild

42

+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild

43

@@ -1,4 +1,4 @@

44

-# Copyright 2019 Gentoo Authors

45

+# Copyright 2020 Gentoo Authors

46

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

47

48

 EAPI=7

49

@@ -9,7 +9,7 @@ DESCRIPTION="VDR plugin: create timers from epg content based on saved search ex

50

 HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"

51

 SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"

52

53

-LICENSE="GPL-2"

54

+LICENSE="GPL-2+"

55

 SLOT="0"

56

 KEYWORDS="~amd64 ~x86"

57

 IUSE="+conflictcheckonly +epgsearchonly pcre +quicksearch tre"

58

@@ -29,23 +29,23 @@ src_prepare() {

59

 	echo "# SOFILE" >> Makefile

60

61

 	# remove untranslated .po files

62

-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po

63

+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die

64

65

 	eapply "${FILESDIR}/vdr-epgsearch-1.x.makefile.patch"

66

67

-	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile

68

-	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile

69

-	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile

70

+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die

71

+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die

72

+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die

73

74

 	vdr-plugin-2_src_prepare

75

76

 	fix_vdr_libsi_include conflictcheck.c

77

78

 	# install conf-file disabled

79

-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf

80

+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die

81

82

 	# Get rid of the broken symlinks

83

-	rm -f README{,.DE} MANUAL

84

+	rm -f README{,.DE} MANUAL || die

85

}

86

87

 src_compile() {

88

89

diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild

90

index 840362e7069..ed89ee0acea 100644

91

--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild

92

+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild

93

@@ -1,4 +1,4 @@

94

-# Copyright 1999-2019 Gentoo Authors

95

+# Copyright 1999-2020 Gentoo Authors

96

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

97

98

 EAPI=7

99

@@ -9,7 +9,7 @@ DESCRIPTION="VDR plugin: create timers from epg content based on saved search ex

100

 HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"

101

 SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"

102

103

-LICENSE="GPL-2"

104

+LICENSE="GPL-2+"

105

 SLOT="0"

106

 KEYWORDS="~amd64 ~x86"

107

 IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"

108

@@ -25,23 +25,23 @@ S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"

109

110

 src_prepare() {

111

 	# remove untranslated .po files

112

-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po

113

+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die

114

115

 	eapply "${FILESDIR}/vdr-epgsearch-2.4.0_makefile.patch"

116

117

-	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile

118

-	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile

119

-	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile

120

+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die

121

+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die

122

+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die

123

124

 	vdr-plugin-2_src_prepare

125

126

 	fix_vdr_libsi_include conflictcheck.c

127

128

 	# install conf-file disabled

129

-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf

130

+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die

131

132

 	# Get rid of the broken symlinks

133

-	rm -f README{,.DE}

134

+	rm -f README{,.DE} || die

135

}

136

137

 src_compile() {

138

139

diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild

140

index c2dec8dea7e..c2fc3ce4361 100644

141

--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild

142

+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild

143

@@ -10,7 +10,7 @@ HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"

144

 GIT_COMMIT_ID="602d66c55964998ce25c6c57b302949a9517f149"

145

 SRC_URI="http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz"

146

147

-LICENSE="GPL-2"

148

+LICENSE="GPL-2+"

149

 SLOT="0"

150

 KEYWORDS="~amd64 ~x86"

151

 IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"

1	commit: 266094f907e43692b5dcf40b9ad57c64a1f65564
2	Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jan 12 17:42:11 2020 +0000
4	Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
5	CommitDate: Sun Jan 12 17:55:50 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266094f9
7
8	media-plugins/vdr-epgsearch: license fixed, added missing die's
9
10	Package-Manager: Portage-2.3.84, Repoman-2.3.20
11	Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
12
13	.../vdr-epgsearch-1.0.1_p20141227-r1.ebuild \| 4 ++--
14	media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild \| 16 ++++++++--------
15	media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild \| 16 ++++++++--------
16	.../vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild \| 2 +-
17	4 files changed, 19 insertions(+), 19 deletions(-)
18
19	diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
20	index c79abd511d1..0917f4f8da5 100644
21	--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
22	+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
23	@@ -1,4 +1,4 @@
24	-# Copyright 2019 Gentoo Authors
25	+# Copyright 2020 Gentoo Authors
26	# Distributed under the terms of the GNU General Public License v2
27
28	EAPI=6
29	@@ -26,7 +26,7 @@ case ${P#*_} in
30	;;
31	esac
32
33	-LICENSE="GPL-2"
34	+LICENSE="GPL-2+"
35	SLOT="0"
36	KEYWORDS="amd64 x86"
37	IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre"
38
39	diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
40	index 036df79eeb1..ba0700f4113 100644
41	--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
42	+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
43	@@ -1,4 +1,4 @@
44	-# Copyright 2019 Gentoo Authors
45	+# Copyright 2020 Gentoo Authors
46	# Distributed under the terms of the GNU General Public License v2
47
48	EAPI=7
49	@@ -9,7 +9,7 @@ DESCRIPTION="VDR plugin: create timers from epg content based on saved search ex
50	HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"
51	SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
52
53	-LICENSE="GPL-2"
54	+LICENSE="GPL-2+"
55	SLOT="0"
56	KEYWORDS="~amd64 ~x86"
57	IUSE="+conflictcheckonly +epgsearchonly pcre +quicksearch tre"
58	@@ -29,23 +29,23 @@ src_prepare() {
59	echo "# SOFILE" >> Makefile
60
61	# remove untranslated .po files
62	- rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
63	+ rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \|\| die
64
65	eapply "${FILESDIR}/vdr-epgsearch-1.x.makefile.patch"
66
67	- use conflictcheckonly \|\| sed -e "s:install-\$(PLUGIN3)::" -i Makefile
68	- use epgsearchonly \|\| sed -e "s:install-\$(PLUGIN2)::" -i Makefile
69	- use quicksearch \|\| sed -e "s:install-\$(PLUGIN4)::" -i Makefile
70	+ use conflictcheckonly \|\| sed -e "s:install-\$(PLUGIN3)::" -i Makefile \|\| die
71	+ use epgsearchonly \|\| sed -e "s:install-\$(PLUGIN2)::" -i Makefile \|\| die
72	+ use quicksearch \|\| sed -e "s:install-\$(PLUGIN4)::" -i Makefile \|\| die
73
74	vdr-plugin-2_src_prepare
75
76	fix_vdr_libsi_include conflictcheck.c
77
78	# install conf-file disabled
79	- sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
80	+ sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf \|\| die
81
82	# Get rid of the broken symlinks
83	- rm -f README{,.DE} MANUAL
84	+ rm -f README{,.DE} MANUAL \|\| die
85	}
86
87	src_compile() {
88
89	diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
90	index 840362e7069..ed89ee0acea 100644
91	--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
92	+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
93	@@ -1,4 +1,4 @@
94	-# Copyright 1999-2019 Gentoo Authors
95	+# Copyright 1999-2020 Gentoo Authors
96	# Distributed under the terms of the GNU General Public License v2
97
98	EAPI=7
99	@@ -9,7 +9,7 @@ DESCRIPTION="VDR plugin: create timers from epg content based on saved search ex
100	HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"
101	SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
102
103	-LICENSE="GPL-2"
104	+LICENSE="GPL-2+"
105	SLOT="0"
106	KEYWORDS="~amd64 ~x86"
107	IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
108	@@ -25,23 +25,23 @@ S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
109
110	src_prepare() {
111	# remove untranslated .po files
112	- rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
113	+ rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \|\| die
114
115	eapply "${FILESDIR}/vdr-epgsearch-2.4.0_makefile.patch"
116
117	- use conflictcheckonly \|\| sed -e "s:install-\$(PLUGIN3)::" -i Makefile
118	- use epgsearchonly \|\| sed -e "s:install-\$(PLUGIN2)::" -i Makefile
119	- use quicksearch \|\| sed -e "s:install-\$(PLUGIN4)::" -i Makefile
120	+ use conflictcheckonly \|\| sed -e "s:install-\$(PLUGIN3)::" -i Makefile \|\| die
121	+ use epgsearchonly \|\| sed -e "s:install-\$(PLUGIN2)::" -i Makefile \|\| die
122	+ use quicksearch \|\| sed -e "s:install-\$(PLUGIN4)::" -i Makefile \|\| die
123
124	vdr-plugin-2_src_prepare
125
126	fix_vdr_libsi_include conflictcheck.c
127
128	# install conf-file disabled
129	- sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
130	+ sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf \|\| die
131
132	# Get rid of the broken symlinks
133	- rm -f README{,.DE}
134	+ rm -f README{,.DE} \|\| die
135	}
136
137	src_compile() {
138
139	diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
140	index c2dec8dea7e..c2fc3ce4361 100644
141	--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
142	+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
143	@@ -10,7 +10,7 @@ HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"
144	GIT_COMMIT_ID="602d66c55964998ce25c6c57b302949a9517f149"
145	SRC_URI="http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
146
147	-LICENSE="GPL-2"
148	+LICENSE="GPL-2+"
149	SLOT="0"
150	KEYWORDS="~amd64 ~x86"
151	IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"

Gentoo Archives: gentoo-commits