[gentoo-commits] repo/gentoo:master commit in: x11-misc/launchy/, x11-misc/launchy/files/ - gentoo-commits

From:	David Seifert <soap@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: x11-misc/launchy/, x11-misc/launchy/files/
Date:	Wed, 01 Mar 2017 20:46:02
Message-Id:	`1488401093.b651b694caf33e73462574468bdf24478bc83894.soap@gentoo`

1

commit:     b651b694caf33e73462574468bdf24478bc83894

2

Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>

3

AuthorDate: Tue Feb 28 08:03:28 2017 +0000

4

Commit:     David Seifert <soap <AT> gentoo <DOT> org>

5

CommitDate: Wed Mar  1 20:44:53 2017 +0000

6

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

7

8

x11-misc/launchy: EAPI bump 4 -> 6

9

10

Package-Manager: Portage-2.3.3, Repoman-2.3.1

11

Closes: https://github.com/gentoo/gentoo/pull/4091

12

13

 .../files/launchy-2.5-prefix-and-libdir.patch      | 112 +++++++++++++++++++++

14

 .../{launchy-2.5.ebuild => launchy-2.5-r1.ebuild}  |  32 ++++--

15

 2 files changed, 133 insertions(+), 11 deletions(-)

16

17

diff --git a/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch b/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch

18

new file mode 100644

19

index 00000000000..5b277786e87

20

--- /dev/null

21

+++ b/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch

22

@@ -0,0 +1,112 @@

23

+diff -ur a/platforms/unix/unix.pro b/platforms/unix/unix.pro

24

+--- a/platforms/unix/unix.pro	2008-09-01 03:40:56.000000000 +0300

25

++++ b/platforms/unix/unix.pro	2017-03-01 15:44:50.201858265 +0200

26

+@@ -11,11 +11,10 @@

27

+

28

+

29

+ unix {

30

+- PREFIX = /usr

31

+  DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \

32

+-           PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \

33

+-           PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\"

34

+- target.path = $$PREFIX/lib/launchy/

35

++           PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \

36

++           PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\"

37

++ target.path = $$PREFIX/$$LIBDIR/launchy/

38

+  INSTALLS += target

39

+ }

40

+

41

+diff -ur a/plugins/calcy/calcy.pro b/plugins/calcy/calcy.pro

42

+--- a/plugins/calcy/calcy.pro	2010-03-08 01:02:22.000000000 +0200

43

++++ b/plugins/calcy/calcy.pro	2017-03-01 15:46:49.252849881 +0200

44

+@@ -26,9 +26,8 @@

45

+

46

+

47

+ unix:!macx {

48

+-    PREFIX = /usr

49

+-    target.path = $$PREFIX/lib/launchy/plugins/

50

+-    icon.path = $$PREFIX/lib/launchy/plugins/icons/

51

++    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

52

++    icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

53

+     icon.files = calcy.png

54

+     INSTALLS += target \

55

+         icon

56

+diff -ur a/plugins/gcalc/gcalc.pro b/plugins/gcalc/gcalc.pro

57

+--- a/plugins/gcalc/gcalc.pro	2010-02-15 23:07:34.000000000 +0200

58

++++ b/plugins/gcalc/gcalc.pro	2017-03-01 15:48:00.542647288 +0200

59

+@@ -19,10 +19,9 @@

60

+ if(!debug_and_release|build_pass):CONFIG(debug, debug|release):DESTDIR = ../../debug/plugins

61

+ if(!debug_and_release|build_pass):CONFIG(release, debug|release):DESTDIR = ../../release/plugins

62

+ unix:!macx {

63

+-    PREFIX = /usr

64

+-    target.path = $$PREFIX/lib/launchy/plugins/

65

++    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

66

+

67

+-    # icon.path = $$PREFIX/lib/launchy/plugins/icons/

68

++    # icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

69

+     # icon.files = gcalc.png

70

+     INSTALLS += target

71

+ }

72

+diff -ur a/plugins/runner/runner.pro b/plugins/runner/runner.pro

73

+--- a/plugins/runner/runner.pro	2010-02-15 23:07:34.000000000 +0200

74

++++ b/plugins/runner/runner.pro	2017-03-01 15:46:22.202306212 +0200

75

+@@ -42,9 +42,8 @@

76

+ }

77

+

78

+ unix:!macx {

79

+- PREFIX = /usr

80

+- target.path = $$PREFIX/lib/launchy/plugins/

81

+- icon.path = $$PREFIX/lib/launchy/plugins/icons/

82

++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

83

++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

84

+  icon.files = runner.png

85

+  INSTALLS += target icon

86

+ }

87

+diff -ur a/plugins/verby/verby.pro b/plugins/verby/verby.pro

88

+--- a/plugins/verby/verby.pro	2010-02-15 23:07:34.000000000 +0200

89

++++ b/plugins/verby/verby.pro	2017-03-01 15:47:09.785503507 +0200

90

+@@ -31,9 +31,8 @@

91

+         /WX

92

+ }

93

+ unix:!macx {

94

+-    PREFIX = /usr

95

+-    target.path = $$PREFIX/lib/launchy/plugins/

96

+-    icon.path = $$PREFIX/lib/launchy/plugins/icons/

97

++    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

98

++    icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

99

+     icon.files = verby.png copy.png opencontainer.png properties.png run.png

100

+     INSTALLS += target \

101

+         icon

102

+diff -ur a/plugins/weby/weby.pro b/plugins/weby/weby.pro

103

+--- a/plugins/weby/weby.pro	2010-02-15 23:07:34.000000000 +0200

104

++++ b/plugins/weby/weby.pro	2017-03-01 15:47:30.764149617 +0200

105

+@@ -32,9 +32,8 @@

106

+ if(!debug_and_release|build_pass):CONFIG(debug, debug|release):DESTDIR = ../../debug/plugins

107

+ if(!debug_and_release|build_pass):CONFIG(release, debug|release):DESTDIR = ../../release/plugins

108

+ unix:!macx {

109

+-    PREFIX = /usr

110

+-    target.path = $$PREFIX/lib/launchy/plugins/

111

+-    icon.path = $$PREFIX/lib/launchy/plugins/icons/

112

++    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

113

++    icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

114

+     icon.files = weby.png

115

+     INSTALLS += target \

116

+         icon

117

+diff -ur a/src/src.pro b/src/src.pro

118

+--- a/src/src.pro	2017-03-01 15:50:28.430152700 +0200

119

++++ b/src/src.pro	2017-03-01 15:51:18.931300883 +0200

120

+@@ -71,11 +71,10 @@

121

+                 platform_base_hotkey.h \

122

+                 platform_base_hottrigger.h

123

+

124

+-    PREFIX = /usr

125

+     LIBS += -lX11 -lXext -lXrender

126

+     DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \

127

+-        PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \

128

+-        PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\"

129

++        PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \

130

++        PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\"

131

+     if(!debug_and_release|build_pass) { 

132

+         CONFIG(debug, debug|release):DESTDIR = ../debug/

133

+         CONFIG(release, debug|release):DESTDIR = ../release/

134

+Only in a/src: src.pro.orig

135

136

diff --git a/x11-misc/launchy/launchy-2.5.ebuild b/x11-misc/launchy/launchy-2.5-r1.ebuild

137

similarity index 56%

138

rename from x11-misc/launchy/launchy-2.5.ebuild

139

rename to x11-misc/launchy/launchy-2.5-r1.ebuild

140

index 566d790d567..8b1a33abaef 100644

141

--- a/x11-misc/launchy/launchy-2.5.ebuild

142

+++ b/x11-misc/launchy/launchy-2.5-r1.ebuild

143

@@ -1,8 +1,8 @@

144

-# Copyright 1999-2013 Gentoo Foundation

145

+# Copyright 1999-2017 Gentoo Foundation

146

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

147

148

-EAPI=4

149

-inherit fdo-mime gnome2-utils qt4-r2

150

+EAPI=6

151

+inherit fdo-mime gnome2-utils qmake-utils

152

153

 DESCRIPTION="utility that merges application menus, your desktop and even your file manager"

154

 HOMEPAGE="http://www.launchy.net/"

155

@@ -13,17 +13,27 @@ SLOT="0"

156

 KEYWORDS="~amd64 ~x86"

157

 IUSE=""

158

159

-RDEPEND="dev-qt/qtgui:4"

160

+RDEPEND="

161

+	dev-qt/qtgui:4

162

+	x11-libs/libX11

163

+"

164

 DEPEND="${RDEPEND}

165

-	dev-libs/boost"

166

+	dev-libs/boost

167

+	x11-proto/xproto

168

+"

169

170

-PATCHES=( "${FILESDIR}"/${P}-underlink.patch )

171

+PATCHES=(

172

+	"${FILESDIR}"/${P}-underlink.patch

173

+	"${FILESDIR}"/${P}-prefix-and-libdir.patch

174

+)

175

176

-src_prepare() {

177

-	sed -i -e "s:lib/launchy:$(get_libdir)/launchy:" src/src.pro \

178

-		platforms/unix/unix.pro \

179

-		plugins/*/*.pro || die "sed failed"

180

-	qt4-r2_src_prepare

181

+src_configure() {

182

+	eqmake4 Launchy.pro PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)"

183

+}

184

+

185

+src_install() {

186

+	emake INSTALL_ROOT="${D}" install

187

+	einstalldocs

188

}

189

190

 pkg_preinst() {

1	commit: b651b694caf33e73462574468bdf24478bc83894
2	Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3	AuthorDate: Tue Feb 28 08:03:28 2017 +0000
4	Commit: David Seifert <soap <AT> gentoo <DOT> org>
5	CommitDate: Wed Mar 1 20:44:53 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b651b694
7
8	x11-misc/launchy: EAPI bump 4 -> 6
9
10	Package-Manager: Portage-2.3.3, Repoman-2.3.1
11	Closes: https://github.com/gentoo/gentoo/pull/4091
12
13	.../files/launchy-2.5-prefix-and-libdir.patch \| 112 +++++++++++++++++++++
14	.../{launchy-2.5.ebuild => launchy-2.5-r1.ebuild} \| 32 ++++--
15	2 files changed, 133 insertions(+), 11 deletions(-)
16
17	diff --git a/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch b/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch
18	new file mode 100644
19	index 00000000000..5b277786e87
20	--- /dev/null
21	+++ b/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch
22	@@ -0,0 +1,112 @@
23	+diff -ur a/platforms/unix/unix.pro b/platforms/unix/unix.pro
24	+--- a/platforms/unix/unix.pro 2008-09-01 03:40:56.000000000 +0300
25	++++ b/platforms/unix/unix.pro 2017-03-01 15:44:50.201858265 +0200
26	+@@ -11,11 +11,10 @@
27	+
28	+
29	+ unix {
30	+- PREFIX = /usr
31	+ DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \
32	+- PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \
33	+- PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\"
34	+- target.path = $$PREFIX/lib/launchy/
35	++ PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \
36	++ PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\"
37	++ target.path = $$PREFIX/$$LIBDIR/launchy/
38	+ INSTALLS += target
39	+ }
40	+
41	+diff -ur a/plugins/calcy/calcy.pro b/plugins/calcy/calcy.pro
42	+--- a/plugins/calcy/calcy.pro 2010-03-08 01:02:22.000000000 +0200
43	++++ b/plugins/calcy/calcy.pro 2017-03-01 15:46:49.252849881 +0200
44	+@@ -26,9 +26,8 @@
45	+
46	+
47	+ unix:!macx {
48	+- PREFIX = /usr
49	+- target.path = $$PREFIX/lib/launchy/plugins/
50	+- icon.path = $$PREFIX/lib/launchy/plugins/icons/
51	++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/
52	++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/
53	+ icon.files = calcy.png
54	+ INSTALLS += target \
55	+ icon
56	+diff -ur a/plugins/gcalc/gcalc.pro b/plugins/gcalc/gcalc.pro
57	+--- a/plugins/gcalc/gcalc.pro 2010-02-15 23:07:34.000000000 +0200
58	++++ b/plugins/gcalc/gcalc.pro 2017-03-01 15:48:00.542647288 +0200
59	+@@ -19,10 +19,9 @@
60	+ if(!debug_and_release\|build_pass):CONFIG(debug, debug\|release):DESTDIR = ../../debug/plugins
61	+ if(!debug_and_release\|build_pass):CONFIG(release, debug\|release):DESTDIR = ../../release/plugins
62	+ unix:!macx {
63	+- PREFIX = /usr
64	+- target.path = $$PREFIX/lib/launchy/plugins/
65	++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/
66	+
67	+- # icon.path = $$PREFIX/lib/launchy/plugins/icons/
68	++ # icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/
69	+ # icon.files = gcalc.png
70	+ INSTALLS += target
71	+ }
72	+diff -ur a/plugins/runner/runner.pro b/plugins/runner/runner.pro
73	+--- a/plugins/runner/runner.pro 2010-02-15 23:07:34.000000000 +0200
74	++++ b/plugins/runner/runner.pro 2017-03-01 15:46:22.202306212 +0200
75	+@@ -42,9 +42,8 @@
76	+ }
77	+
78	+ unix:!macx {
79	+- PREFIX = /usr
80	+- target.path = $$PREFIX/lib/launchy/plugins/
81	+- icon.path = $$PREFIX/lib/launchy/plugins/icons/
82	++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/
83	++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/
84	+ icon.files = runner.png
85	+ INSTALLS += target icon
86	+ }
87	+diff -ur a/plugins/verby/verby.pro b/plugins/verby/verby.pro
88	+--- a/plugins/verby/verby.pro 2010-02-15 23:07:34.000000000 +0200
89	++++ b/plugins/verby/verby.pro 2017-03-01 15:47:09.785503507 +0200
90	+@@ -31,9 +31,8 @@
91	+ /WX
92	+ }
93	+ unix:!macx {
94	+- PREFIX = /usr
95	+- target.path = $$PREFIX/lib/launchy/plugins/
96	+- icon.path = $$PREFIX/lib/launchy/plugins/icons/
97	++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/
98	++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/
99	+ icon.files = verby.png copy.png opencontainer.png properties.png run.png
100	+ INSTALLS += target \
101	+ icon
102	+diff -ur a/plugins/weby/weby.pro b/plugins/weby/weby.pro
103	+--- a/plugins/weby/weby.pro 2010-02-15 23:07:34.000000000 +0200
104	++++ b/plugins/weby/weby.pro 2017-03-01 15:47:30.764149617 +0200
105	+@@ -32,9 +32,8 @@
106	+ if(!debug_and_release\|build_pass):CONFIG(debug, debug\|release):DESTDIR = ../../debug/plugins
107	+ if(!debug_and_release\|build_pass):CONFIG(release, debug\|release):DESTDIR = ../../release/plugins
108	+ unix:!macx {
109	+- PREFIX = /usr
110	+- target.path = $$PREFIX/lib/launchy/plugins/
111	+- icon.path = $$PREFIX/lib/launchy/plugins/icons/
112	++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/
113	++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/
114	+ icon.files = weby.png
115	+ INSTALLS += target \
116	+ icon
117	+diff -ur a/src/src.pro b/src/src.pro
118	+--- a/src/src.pro 2017-03-01 15:50:28.430152700 +0200
119	++++ b/src/src.pro 2017-03-01 15:51:18.931300883 +0200
120	+@@ -71,11 +71,10 @@
121	+ platform_base_hotkey.h \
122	+ platform_base_hottrigger.h
123	+
124	+- PREFIX = /usr
125	+ LIBS += -lX11 -lXext -lXrender
126	+ DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \
127	+- PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \
128	+- PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\"
129	++ PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \
130	++ PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\"
131	+ if(!debug_and_release\|build_pass) {
132	+ CONFIG(debug, debug\|release):DESTDIR = ../debug/
133	+ CONFIG(release, debug\|release):DESTDIR = ../release/
134	+Only in a/src: src.pro.orig
135
136	diff --git a/x11-misc/launchy/launchy-2.5.ebuild b/x11-misc/launchy/launchy-2.5-r1.ebuild
137	similarity index 56%
138	rename from x11-misc/launchy/launchy-2.5.ebuild
139	rename to x11-misc/launchy/launchy-2.5-r1.ebuild
140	index 566d790d567..8b1a33abaef 100644
141	--- a/x11-misc/launchy/launchy-2.5.ebuild
142	+++ b/x11-misc/launchy/launchy-2.5-r1.ebuild
143	@@ -1,8 +1,8 @@
144	-# Copyright 1999-2013 Gentoo Foundation
145	+# Copyright 1999-2017 Gentoo Foundation
146	# Distributed under the terms of the GNU General Public License v2
147
148	-EAPI=4
149	-inherit fdo-mime gnome2-utils qt4-r2
150	+EAPI=6
151	+inherit fdo-mime gnome2-utils qmake-utils
152
153	DESCRIPTION="utility that merges application menus, your desktop and even your file manager"
154	HOMEPAGE="http://www.launchy.net/"
155	@@ -13,17 +13,27 @@ SLOT="0"
156	KEYWORDS="~amd64 ~x86"
157	IUSE=""
158
159	-RDEPEND="dev-qt/qtgui:4"
160	+RDEPEND="
161	+ dev-qt/qtgui:4
162	+ x11-libs/libX11
163	+"
164	DEPEND="${RDEPEND}
165	- dev-libs/boost"
166	+ dev-libs/boost
167	+ x11-proto/xproto
168	+"
169
170	-PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
171	+PATCHES=(
172	+ "${FILESDIR}"/${P}-underlink.patch
173	+ "${FILESDIR}"/${P}-prefix-and-libdir.patch
174	+)
175
176	-src_prepare() {
177	- sed -i -e "s:lib/launchy:$(get_libdir)/launchy:" src/src.pro \
178	- platforms/unix/unix.pro \
179	- plugins//.pro \|\| die "sed failed"
180	- qt4-r2_src_prepare
181	+src_configure() {
182	+ eqmake4 Launchy.pro PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)"
183	+}
184	+
185	+src_install() {
186	+ emake INSTALL_ROOT="${D}" install
187	+ einstalldocs
188	}
189
190	pkg_preinst() {

Gentoo Archives: gentoo-commits