[gentoo-commits] repo/gentoo:master commit in: profiles/, net-p2p/syncthing-relaysrv/files/, net-p2p/syncthing-relaysrv/

2016-08-07 Thread Michał Górny 
commit: 1618ebe0c6201a159532caf5cf694fc79a454061
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  7 17:22:52 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  7 17:25:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1618ebe0

net-p2p/syncthing-relaysrv: Remove last-rited pkg

 net-p2p/syncthing-relaysrv/Manifest|  1 -
 .../files/syncthing-relaysrv.confd |  3 --
 .../files/syncthing-relaysrv.initd | 24 ---
 .../files/syncthing-relaysrv.service   | 18 
 net-p2p/syncthing-relaysrv/metadata.xml| 20 -
 .../syncthing-relaysrv-0.12.18.ebuild  | 48 --
 profiles/package.mask  |  6 ---
 7 files changed, 120 deletions(-)

diff --git a/net-p2p/syncthing-relaysrv/Manifest 
b/net-p2p/syncthing-relaysrv/Manifest
deleted file mode 100644
index 058228a..000
--- a/net-p2p/syncthing-relaysrv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST syncthing-relaysrv-0.12.18.tar.gz 174413 SHA256 
ce21cd29bd091c3dbdc138dc94ede63b6d815b664b615a87a4f1b01ee5f2ce35 SHA512 
58f0494bc61e2d62e54535483b8ff7053d433b17a94c85a006a72a9d82d4cd454f97daa9c2648cf63ff4dd55f2fc6c3a85eb5295309cacec3ea2b8fa58d166ff
 WHIRLPOOL 
3f8ffaf1f328244e3a09d817091e06a7f241351845fb8ac62e299681d8d53e43f4370d923cc9cee98064f4e58c195b858295b627e0686c7f9d7171a6610bd87e

diff --git a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.confd 
b/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.confd
deleted file mode 100644
index a09a708..000
--- a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Options to pass to syncthing-relaysrv
-# see syncthing-relaysrv --help for more information
-SR_OPTS=

diff --git a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.initd 
b/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.initd
deleted file mode 100644
index 5ee25af..000
--- a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-SR_USER=syncthing-relaysrv
-SR_GROUP=syncthing-relaysrv
-SR_HOMEDIR=/var/lib/syncthing-relaysrv
-
-description="Relay service for syncthing"
-command="/usr/bin/syncthing-relaysrv"
-command_args="${SR_OPTS}"
-pidfile="/run/syncthing-relaysrv.pid"
-start_stop_daemon_args="--background
-  --user ${SR_USER}
-  --group ${SR_GROUP}
-  --chdir \"${SR_HOMEDIR}\"
-  --make-pidfile "
-
-depend() {
-  need net
-}
-
-start_pre() {
-  checkpath -q -d -o ${SR_USER}:${SR_GROUP} ${SR_HOMEDIR}
-}

diff --git a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.service 
b/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.service
deleted file mode 100644
index 5dc3eee..000
--- a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Syncthing relay server
-After=network.target
-
-[Service]
-User=syncthing-relaysrv
-Group=syncthing-relaysrv
-ExecStart=/usr/bin/syncthing-relaysrv
-WorkingDirectory=/var/lib/syncthing-relaysrv
-RootDirectory=/var/lib/syncthing-relaysrv
-
-PrivateTmp=true
-ProtectSystem=full
-ProtectHome=true
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-p2p/syncthing-relaysrv/metadata.xml 
b/net-p2p/syncthing-relaysrv/metadata.xml
deleted file mode 100644
index e6e03d7..000
--- a/net-p2p/syncthing-relaysrv/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-kaikai...@yandex.ru
-Alexey Korepanov
-  
-  
-proxy-ma...@gentoo.org
-Proxy Maintainers
-  
-  
-Relay server for Syncthing helps people behind nats and 
-firewalls synchronize their data.
-  
-  
-syncthing/relaysrv
-https://github.com/syncthing/relaysrv/issues
-  
-

diff --git a/net-p2p/syncthing-relaysrv/syncthing-relaysrv-0.12.18.ebuild 
b/net-p2p/syncthing-relaysrv/syncthing-relaysrv-0.12.18.ebuild
deleted file mode 100644
index a0cae01..000
--- a/net-p2p/syncthing-relaysrv/syncthing-relaysrv-0.12.18.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGO_PN="github.com/syncthing/relaysrv"
-EGIT_COMMIT=v${PV}
-
-inherit golang-vcs-snapshot systemd user versionator
-
-DESCRIPTION="Syncthing relay server"
-HOMEPAGE="https://syncthing.net;
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="README.md"
-
-USER=syncthing-relaysrv
-BINARY=syncthing-relaysrv
-
-pkg_setup() {
-   enewgroup ${USER}
-   enewuser ${USER} -1 -1 /var/lib/${USER} ${USER}
-}
-
-src_compile() {
-   cd "src/${EGO_PN}" || die "build failed"
-   export

[gentoo-commits] repo/gentoo:master commit in: profiles/, net-p2p/syncthing-relaysrv/files/

2016-07-05 Thread Dirkjan Ochtman 
commit: 192eb4151bb1a903a1202bad42e9a9ef0b702db4
Author: Alexey Korepanov  yandex  ru>
AuthorDate: Sun Jun 26 11:23:24 2016 +
Commit: Dirkjan Ochtman  gentoo  org>
CommitDate: Tue Jul  5 18:10:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192eb415

net-p2p/syncthing-relaysrv: mask for removal

 net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.confd | 0
 net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.initd | 0
 profiles/package.mask | 6 ++
 3 files changed, 6 insertions(+)

diff --git a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.confd 
b/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.confd
old mode 100755
new mode 100644

diff --git a/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.initd 
b/net-p2p/syncthing-relaysrv/files/syncthing-relaysrv.initd
old mode 100755
new mode 100644

diff --git a/profiles/package.mask b/profiles/package.mask
index 5910222..804371b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexey Korepanov  (5 Jul 2016)
+# net-p2p/syncthing-relaysrv has been merged into net-p2p/syncthing
+# both upstream and in Gentoo.
+# Removal in 30 days.
+net-p2p/syncthing-relaysrv
+
 # Agostino Sarubbo  (5 Jul 2016)
 # Dead upstream and fails to compile, wrt bug #587766
 # Masked for removal in 30 days.