1 |
commit: 08a0d94873a352ccc79bdcda8f5add73a8514241 |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 18 09:51:49 2017 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 18 09:52:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08a0d948 |
7 |
|
8 |
net-misc/geomyidae: version bump, drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.10, Repoman-2.3.1 |
11 |
|
12 |
net-misc/geomyidae/Manifest | 3 +- |
13 |
net-misc/geomyidae/geomyidae-0.26.3.ebuild | 49 ---------------------- |
14 |
...omyidae-0.26.2.ebuild => geomyidae-0.29.ebuild} | 19 ++++++--- |
15 |
3 files changed, 14 insertions(+), 57 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest |
18 |
index f9c6fcddbff..5be82023e84 100644 |
19 |
--- a/net-misc/geomyidae/Manifest |
20 |
+++ b/net-misc/geomyidae/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST geomyidae-0.26.2.tar.gz 15399 SHA256 49b4fbc437321e31a3b073cf8b88ddd4482b35a144a4289b4849e2242b991465 SHA512 337665350ee9fc09a88c83ebc8dd8d53ead9c5542c90c23f519bc99c1a1055e4751e78dbb70578325ba42d9aa59adcbbf4e32629fc75744b70e7ddc4c8266dce WHIRLPOOL 9e2409c7f5d5be2b46e43908db065a56db2e488b0769415cce9fb4b828d0f213a836e48068812d2e7aa9ee7cfd00d1970e04c504e18e9186b573e275a0c0ae2e |
23 |
-DIST geomyidae-0.26.3.tar.gz 15556 SHA256 162f55ab059ab0a9be8e840497795293bbd51c34b1f4564dcdf3f0ddd5c0db31 SHA512 fcee0133547881f6df173a24eac0fd3007436365375f11c572c50cf2e77c2033d441209f7f20dab1d291b0e9305de245da409351a02df4ca92d7b158768424b3 WHIRLPOOL 79385698ddd1c9c99fbb03c77ac6e817e157e3d8779f9929fe5ae281472bbc00eec81a18b2fe02c27fd96377e6b20e5e2d0b18d9bb747a3004aa96db076bcaf3 |
24 |
+DIST geomyidae-0.29.tar.bz2 16279 SHA256 4a2e63c65ff2007179ebb63549f7ae19876549f902fb6621762f3b7dcdedaf63 SHA512 00bc7c4b5c1cd58d7e36cc5bce9a8d2e3dd70ccfd2f3c2729527ed7c55ced04aa0f9cf024b825f6f3317b2c1b35b4f3fd4dd88c83b14369e98b72b59965b0aa2 WHIRLPOOL 266b1f3c16604a6f963b535be2bfdd00a31d9174002f1eed39c2579b4d72fa866be30b3c8655e4a8b70fd8e3cfb4d74a42b08193809e6e64aa4cb70964e3b0ac |
25 |
|
26 |
diff --git a/net-misc/geomyidae/geomyidae-0.26.3.ebuild b/net-misc/geomyidae/geomyidae-0.26.3.ebuild |
27 |
deleted file mode 100644 |
28 |
index f6c4c90a5a2..00000000000 |
29 |
--- a/net-misc/geomyidae/geomyidae-0.26.3.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,49 +0,0 @@ |
32 |
-# Copyright 1999-2013 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=5 |
36 |
- |
37 |
-inherit eutils toolchain-funcs user |
38 |
- |
39 |
-DESCRIPTION="A daemon to serve the gopher protocol" |
40 |
-HOMEPAGE="http://r-36.net/src/geomyidae/" |
41 |
-SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz" |
42 |
- |
43 |
-LICENSE="MIT" |
44 |
-SLOT="0" |
45 |
-KEYWORDS="~amd64 ~arm ~x86" |
46 |
- |
47 |
-pkg_setup(){ |
48 |
- enewgroup gopherd |
49 |
- enewuser gopherd -1 -1 /var/gopher gopherd |
50 |
-} |
51 |
- |
52 |
-src_prepare() { |
53 |
- # enable verbose build |
54 |
- # drop -O. from CFLAGS |
55 |
- sed -i \ |
56 |
- -e 's/@${CC}/${CC}/g' \ |
57 |
- -e '/CFLAGS/s/-O. //' \ |
58 |
- Makefile || die 'sed on Makefile failed' |
59 |
- |
60 |
- epatch_user |
61 |
-} |
62 |
- |
63 |
-src_compile() { |
64 |
- emake CC="$(tc-getCC)" |
65 |
-} |
66 |
- |
67 |
-src_install() { |
68 |
- dosbin ${PN} |
69 |
- |
70 |
- newinitd rc.d/Gentoo.init.d ${PN} |
71 |
- newconfd rc.d/Gentoo.conf.d ${PN} |
72 |
- |
73 |
- insinto /var/gopher |
74 |
- doins index.gph |
75 |
- fowners -R root.gopherd /var/gopher |
76 |
- fperms -R g=rX,o=rX /var/gopher |
77 |
- |
78 |
- doman ${PN}.8 |
79 |
- dodoc CGI README |
80 |
-} |
81 |
|
82 |
diff --git a/net-misc/geomyidae/geomyidae-0.26.2.ebuild b/net-misc/geomyidae/geomyidae-0.29.ebuild |
83 |
similarity index 61% |
84 |
rename from net-misc/geomyidae/geomyidae-0.26.2.ebuild |
85 |
rename to net-misc/geomyidae/geomyidae-0.29.ebuild |
86 |
index f6c4c90a5a2..57dec0d5956 100644 |
87 |
--- a/net-misc/geomyidae/geomyidae-0.26.2.ebuild |
88 |
+++ b/net-misc/geomyidae/geomyidae-0.29.ebuild |
89 |
@@ -1,13 +1,13 @@ |
90 |
-# Copyright 1999-2013 Gentoo Foundation |
91 |
+# Copyright 1999-2017 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
|
94 |
-EAPI=5 |
95 |
+EAPI=6 |
96 |
|
97 |
-inherit eutils toolchain-funcs user |
98 |
+inherit toolchain-funcs user |
99 |
|
100 |
DESCRIPTION="A daemon to serve the gopher protocol" |
101 |
-HOMEPAGE="http://r-36.net/src/geomyidae/" |
102 |
-SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz" |
103 |
+HOMEPAGE="http://git.r-36.net/geomyidae/" |
104 |
+SRC_URI="http://git.r-36.net/geomyidae/snapshot/${P}.tar.bz2" |
105 |
|
106 |
LICENSE="MIT" |
107 |
SLOT="0" |
108 |
@@ -25,8 +25,15 @@ src_prepare() { |
109 |
-e 's/@${CC}/${CC}/g' \ |
110 |
-e '/CFLAGS/s/-O. //' \ |
111 |
Makefile || die 'sed on Makefile failed' |
112 |
+ # fix for correctly start/stop daemon |
113 |
+ # fix path for pid file |
114 |
+ sed -i \ |
115 |
+ -e 's:start-stop-daemon -Sb:start-stop-daemon -Sbm:' \ |
116 |
+ -e 's:start-stop-daemon -S -p:start-stop-daemon -K -p:' \ |
117 |
+ -e 's:/var/run:/run:g' \ |
118 |
+ rc.d/Gentoo.init.d || die |
119 |
|
120 |
- epatch_user |
121 |
+ eapply_user |
122 |
} |
123 |
|
124 |
src_compile() { |