commit:     08a0d94873a352ccc79bdcda8f5add73a8514241
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 09:51:49 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 09:52:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08a0d948

net-misc/geomyidae: version bump, drop old

Package-Manager: Portage-2.3.10, Repoman-2.3.1

 net-misc/geomyidae/Manifest                        |  3 +-
 net-misc/geomyidae/geomyidae-0.26.3.ebuild         | 49 ----------------------
 ...omyidae-0.26.2.ebuild => geomyidae-0.29.ebuild} | 19 ++++++---
 3 files changed, 14 insertions(+), 57 deletions(-)

diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index f9c6fcddbff..5be82023e84 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,2 +1 @@
-DIST geomyidae-0.26.2.tar.gz 15399 SHA256 
49b4fbc437321e31a3b073cf8b88ddd4482b35a144a4289b4849e2242b991465 SHA512 
337665350ee9fc09a88c83ebc8dd8d53ead9c5542c90c23f519bc99c1a1055e4751e78dbb70578325ba42d9aa59adcbbf4e32629fc75744b70e7ddc4c8266dce
 WHIRLPOOL 
9e2409c7f5d5be2b46e43908db065a56db2e488b0769415cce9fb4b828d0f213a836e48068812d2e7aa9ee7cfd00d1970e04c504e18e9186b573e275a0c0ae2e
-DIST geomyidae-0.26.3.tar.gz 15556 SHA256 
162f55ab059ab0a9be8e840497795293bbd51c34b1f4564dcdf3f0ddd5c0db31 SHA512 
fcee0133547881f6df173a24eac0fd3007436365375f11c572c50cf2e77c2033d441209f7f20dab1d291b0e9305de245da409351a02df4ca92d7b158768424b3
 WHIRLPOOL 
79385698ddd1c9c99fbb03c77ac6e817e157e3d8779f9929fe5ae281472bbc00eec81a18b2fe02c27fd96377e6b20e5e2d0b18d9bb747a3004aa96db076bcaf3
+DIST geomyidae-0.29.tar.bz2 16279 SHA256 
4a2e63c65ff2007179ebb63549f7ae19876549f902fb6621762f3b7dcdedaf63 SHA512 
00bc7c4b5c1cd58d7e36cc5bce9a8d2e3dd70ccfd2f3c2729527ed7c55ced04aa0f9cf024b825f6f3317b2c1b35b4f3fd4dd88c83b14369e98b72b59965b0aa2
 WHIRLPOOL 
266b1f3c16604a6f963b535be2bfdd00a31d9174002f1eed39c2579b4d72fa866be30b3c8655e4a8b70fd8e3cfb4d74a42b08193809e6e64aa4cb70964e3b0ac

diff --git a/net-misc/geomyidae/geomyidae-0.26.3.ebuild 
b/net-misc/geomyidae/geomyidae-0.26.3.ebuild
deleted file mode 100644
index f6c4c90a5a2..00000000000
--- a/net-misc/geomyidae/geomyidae-0.26.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/src/geomyidae/";
-SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-pkg_setup(){
-       enewgroup gopherd
-       enewuser gopherd -1 -1 /var/gopher gopherd
-}
-
-src_prepare() {
-       # enable verbose build
-       # drop -O. from CFLAGS
-       sed -i \
-               -e 's/@${CC}/${CC}/g' \
-               -e '/CFLAGS/s/-O. //' \
-               Makefile || die 'sed on Makefile failed'
-
-       epatch_user
-}
-
-src_compile() {
-       emake CC="$(tc-getCC)"
-}
-
-src_install() {
-       dosbin ${PN}
-
-       newinitd rc.d/Gentoo.init.d ${PN}
-       newconfd rc.d/Gentoo.conf.d ${PN}
-
-       insinto /var/gopher
-       doins index.gph
-       fowners -R root.gopherd /var/gopher
-       fperms -R g=rX,o=rX /var/gopher
-
-       doman ${PN}.8
-       dodoc CGI README
-}

diff --git a/net-misc/geomyidae/geomyidae-0.26.2.ebuild 
b/net-misc/geomyidae/geomyidae-0.29.ebuild
similarity index 61%
rename from net-misc/geomyidae/geomyidae-0.26.2.ebuild
rename to net-misc/geomyidae/geomyidae-0.29.ebuild
index f6c4c90a5a2..57dec0d5956 100644
--- a/net-misc/geomyidae/geomyidae-0.26.2.ebuild
+++ b/net-misc/geomyidae/geomyidae-0.29.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs user
+inherit toolchain-funcs user
 
 DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/src/geomyidae/";
-SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz";
+HOMEPAGE="http://git.r-36.net/geomyidae/";
+SRC_URI="http://git.r-36.net/geomyidae/snapshot/${P}.tar.bz2";
 
 LICENSE="MIT"
 SLOT="0"
@@ -25,8 +25,15 @@ src_prepare() {
                -e 's/@${CC}/${CC}/g' \
                -e '/CFLAGS/s/-O. //' \
                Makefile || die 'sed on Makefile failed'
+       # fix for correctly start/stop daemon
+       # fix path for pid file
+       sed -i \
+               -e 's:start-stop-daemon -Sb:start-stop-daemon -Sbm:' \
+               -e 's:start-stop-daemon -S -p:start-stop-daemon -K -p:' \
+               -e 's:/var/run:/run:g' \
+               rc.d/Gentoo.init.d || die
 
-       epatch_user
+       eapply_user
 }
 
 src_compile() {

Reply via email to