From 7d863c2a0901efecc870d461c6efef23f7232721 Mon Sep 17 00:00:00 2001 From: Anton Schubert Date: Mon, 10 Feb 2020 11:34:17 +0100 Subject: [PATCH] remove net-p2p/syncthing in favor of upstream --- net-p2p/syncthing/Manifest | 7 -- net-p2p/syncthing/files/conf.d/syncthing | 16 ----- net-p2p/syncthing/files/init.d/syncthing | 37 ---------- net-p2p/syncthing/syncthing-0.11.10.ebuild | 78 ---------------------- net-p2p/syncthing/syncthing-0.12.4.ebuild | 64 ------------------ net-p2p/syncthing/syncthing-9999.ebuild | 52 --------------- 6 files changed, 254 deletions(-) delete mode 100644 net-p2p/syncthing/Manifest delete mode 100644 net-p2p/syncthing/files/conf.d/syncthing delete mode 100644 net-p2p/syncthing/files/init.d/syncthing delete mode 100644 net-p2p/syncthing/syncthing-0.11.10.ebuild delete mode 100644 net-p2p/syncthing/syncthing-0.12.4.ebuild delete mode 100644 net-p2p/syncthing/syncthing-9999.ebuild diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest deleted file mode 100644 index 9d14420..0000000 --- a/net-p2p/syncthing/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX conf.d/syncthing 485 SHA256 03e1a450f779ce8533c568fe711cb93f20b16fb0de9cf8a1c729c63f12d3c00e SHA512 fae2a22e18cc014294a79936881fc23b72a882c1bdce21b767b4e35ed5f4474d2ac3020e79c5566ef2f9729ecd7dbe510163b8fc8ecb3554b93281a1b423e555 WHIRLPOOL e0128e63652981d7750efcba8b0e8c168e86d18f72a2f5660916b6931e9a6ee738914e6903f36fa8eef8e163a707e4ad0e06f918c8f3be116bfca8e621046ad8 -AUX init.d/syncthing 849 SHA256 f8f05cdfeeafcb8d17abe79391c0fb7324371a003c4b8cbebeb8b7a7f519f007 SHA512 ad2034ee19150b67590a9e503fdf2c8250b0a0aef5f567dd5c1da114a40f039f327f35cce02d71d98d970f18b907dff14645bd69c37b9352bcc7944aeccfcc38 WHIRLPOOL 80c826163ccbafc9363dca24dc9fab22d78c8cd6a7af59f27fe6626a3ced6e54eb2f2e2a96761671bd98eaaaa56e3a33899a4d74c8614794e318b5197db5bb39 -DIST syncthing-0.12.4.tar.gz 3980565 SHA256 c8db6feb385f95b3040fa3fd9bcdf662a1faaa882fe6011b30c8bbd07cc49b83 SHA512 3d75054cad561c42baa1defc6e36cc1e35ee6102219d88841757708aa8b6002aaa327d1cb885f028e2c847fbd680500c7e6186a35671c384c572cd626cc1332b WHIRLPOOL 6275e1734255e18fce7549b4c31c3553c487a589d82a05ff09c29d6b036bf0f9fea04287c009a316bee16fd9db1b60191b5b2ee9508c54f2b539dae298180d0f -DIST syncthing-linux-amd64-v0.11.10.tar.gz 4294399 SHA256 db4845cbc75b832f0de9ad4d1b431047eb1e2a12ee5f5577be7c7181faadda2a SHA512 8dac38019e2125eb642f8e2095575f03d41f14cce1a47be2f0a3dd4ef9759ea8d5d1515d011b11d8773781ad59fcae5619555d83beee14f964a5fdd9eb44bd50 WHIRLPOOL f4b57501c9f5bc4c9422b68ea323948d4f7fe398950f7ff47a66bdda842162507f9651c122950355ba3132d81e10c8326ff203d97fb8bc2d2117137d9e9a5558 -EBUILD syncthing-0.11.10.ebuild 2176 SHA256 96d33f9aa7ee6b89ef0853367ecdf5b323fe3fcbf7f7ffa27a7eb97185ef627b SHA512 48ea3334ad9185c4f6997fd50286bc0ea4e1f81110bc10deabcbb221ee4ae9a72b886972c4ebd937695ad151ac698f6960dea75ee0cd99f8c7b0d227a3f6bb58 WHIRLPOOL 40fe61a046b935449a236321ebcd47e96430aad7dcf43543f415dc7c69d8bd81ec10333a8ad397c4b06ef4a805297ef94b5751a9cbeebc9d40d307dec1f6541e -EBUILD syncthing-0.12.4.ebuild 1693 SHA256 61f875eedb55f9c24ff5cef93c93b9c5a42c51a48aa14179c3235372a4f0acb7 SHA512 1db8187521299713a80ee37d1fb6c79a744f551c8b6eec22c7aa999bc9b26e3ba964e969727c8f22d139fdf8fb127694ad3287836a64275fc54be41b0a150225 WHIRLPOOL 08d94e48c7741cdea76898d3d9656bdfa7a57e9b2a00b19657097da4ffa817797c4b56963333f22ba70d17a931348e0dc673ef7225e1125b331b6c9c3e8d10da -EBUILD syncthing-9999.ebuild 1380 SHA256 43a8bf73dfcc451685e725469fd1a4334669a4cc64f073da12c47ea7206fb529 SHA512 e99d8e3de0e7206224f79227a2ff30af5a2c1abe5bcefe6cd045350f6a6dc87f4f1ad7dd25078d94b81b77a431021ecf7e99db3628083f3363e7425fd8f0f5df WHIRLPOOL 50448032c84ecaba7b31c15d7aa17bc00c4c441ebf1c938cc112591e41165da13422b65861341e84cb62997fbfc86b403a64b5c3642117467bcc196f40415637 diff --git a/net-p2p/syncthing/files/conf.d/syncthing b/net-p2p/syncthing/files/conf.d/syncthing deleted file mode 100644 index c6a27af..0000000 --- a/net-p2p/syncthing/files/conf.d/syncthing +++ /dev/null @@ -1,16 +0,0 @@ -# Config file for /etc/init.d/syncthing - -SYNC_NAME="syncthing" -SYNC_PIDFILE="/var/run/${SYNC_NAME}.pid" - -# If you are going to run syncthing as a user, also uncomment the SYNC_HOME line -SYNC_USER="root" -SYNC_GROUP="root" -#SYNC_HOME="/home/${SYNC_USER}/.config/${SYNC_NAME}" - -# Make sure SYNC_HOME is set to something so we reduce DRY here and in the init script -SYNC_HOME="${SYNC_HOME:-/etc/${SYNC_NAME}}" - -# Any options you want you can set them here -SYNC_OPTS="--home=${SYNC_HOME}" - diff --git a/net-p2p/syncthing/files/init.d/syncthing b/net-p2p/syncthing/files/init.d/syncthing deleted file mode 100644 index 4475986..0000000 --- a/net-p2p/syncthing/files/init.d/syncthing +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/runscript - -# Copyright 2014-2015 Jonathan Vasquez -# Distributed under the terms of the GNU General Public License v2 - -DISPLAY_NAME="SyncThing" - -SYNC_PATH="/usr/bin" -SYNC_BINARY="${SYNC_PATH}/${SYNC_NAME}" -SYNC_USER="${SYNC_USER:-root}" -SYNC_GROUP="${SYNC_GROUP:-root}" -SYNC_HOME="${SYNC_HOME:-/etc/${SYNC_NAME}}" - -start() { - ebegin "Starting ${DISPLAY_NAME}" - - if [[ ${SYNC_USER} == "root" ]]; then - SYNC_NAME="root" - SYNC_GROUP="root" - - einfo "Running ${DISPLAY_NAME} as root:root. Home directory: ${SYNC_HOME}" - fi - - start-stop-daemon -m --pidfile "${SYNC_PIDFILE}" -b \ - --start --user ${SYNC_USER} --group ${SYNC_GROUP} --exec "${SYNC_BINARY}" -- ${SYNC_OPTS} - - eend $? -} - -stop() { - ebegin "Stopping ${DISPLAY_NAME}" - - start-stop-daemon --stop --exec "${SYNC_BINARY}" --pidfile "${SYNC_PIDFILE}" - - eend $? -} - diff --git a/net-p2p/syncthing/syncthing-0.11.10.ebuild b/net-p2p/syncthing/syncthing-0.11.10.ebuild deleted file mode 100644 index 84aca10..0000000 --- a/net-p2p/syncthing/syncthing-0.11.10.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 2014 Jonathan Vasquez -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit user systemd - -GITHUB_USER="syncthing" -GITHUB_REPO="syncthing" -GITHUB_TAG="${PV}" - -NAME="syncthing" -DESCRIPTION="Open Source Continuous File Synchronization" -HOMEPAGE="http://syncthing.net/" - -SRC_URI=" - amd64? ( https://github.com/${GITHUB_USER}/${GITHUB_REPO}/releases/download/v${GITHUB_TAG}/syncthing-linux-amd64-v${PV}.tar.gz )" -#https://github.com/$//archive/v${GITHUB_TAG}.tar.gz -> ${P}.tar.gz -#https://github.com/{GITHUB_USER}/${GITHUB_REPO}/releases/download/v${GITHUB_TAG}/syncthing-linux-amd64-v${PV}.tar.gz -RESTRICT="mirror" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=">=dev-lang/go-1.3.0" - -S="${WORKDIR}" - -configDir="/etc/${PN}" -config="${configDir}/config.xml" - -src_install() { - # Create directory structure recommended by SyncThing Documentation - # Since Go is "very particular" about file locations. - local newBaseDir="src/github.com/${PN}" - local newWorkDir="${newBaseDir}/${PN}" - - mkdir -p "${newBaseDir}" - mv "${P}" "${newWorkDir}" - - cd "${newWorkDir}" - - # Build SyncThing ;D - go run build.go -version v${PV} -no-upgrade=true - - # Copy compiled binary over to image directory - dobin "${WORKDIR}/syncthing-linux-amd64-v${PV}/syncthing" - - # Install the OpenRC init file - doinitd "${FILESDIR}/init.d/${NAME}" - - # Install the systemd unit file - systemd_newunit "${FILESDIR}/${PN}_.service" "${PN}@.service" -} - -pkg_postinst() { - if [[ ! -d "${configDir}" ]]; then - mkdir "${configDir}" - fi - - if [[ ! -e "${config}" ]]; then - einfo "Generating default configuration file ..." - - syncthing -generate "${configDir}" - - # Remove 'default' folder (it has an incorrect path anyway) - sed -i '//d' "${config}" - fi - - elog "In order to be able to view the Web UI remotely (from another machine)," - elog "edit your ${config} and change the 127.0.0.1:8080 to 0.0.0.0:8080 in" - elog "the 'address' section." - elog "" - elog "After checking your config, run 'rc-config start ${PN}' to start the application." - elog "Point your browser to the address above to access the Web UI." - elog "" -} - diff --git a/net-p2p/syncthing/syncthing-0.12.4.ebuild b/net-p2p/syncthing/syncthing-0.12.4.ebuild deleted file mode 100644 index d11f898..0000000 --- a/net-p2p/syncthing/syncthing-0.12.4.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2014-2015 Jonathan Vasquez -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit user systemd - -GITHUB_USER="syncthing" -GITHUB_REPO="syncthing" -GITHUB_TAG="${PV}" - -NAME="syncthing" -DESCRIPTION="Open Source Continuous File Synchronization" -HOMEPAGE="http://syncthing.net/" - -SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/v${GITHUB_TAG}.tar.gz -> ${P}.tar.gz" - -RESTRICT="mirror" -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~x86 ~amd64" - -DEPEND=">=dev-lang/go-1.4.2" - -S="${WORKDIR}" - -configDir="~/.config/syncthing" -config="${configDir}/config.xml" - -src_install() { - # Create directory structure recommended by SyncThing Documentation - # Since Go is "very particular" about file locations. - local newBaseDir="src/github.com/${PN}" - local newWorkDir="${newBaseDir}/${PN}" - - mkdir -p "${newBaseDir}" - mv "${P}" "${newWorkDir}" - - cd "${newWorkDir}" - - # Build SyncThing ;D - go run build.go -version v${PV} -no-upgrade=true - - # Copy compiled binary over to image directory - dobin "bin/${PN}" - - # Install the OpenRC init/conf files - doinitd "${FILESDIR}/init.d/${NAME}" - doconfd "${FILESDIR}/conf.d/${NAME}" - - # Install the systemd service files - local systemdServiceFile="etc/linux-systemd/system/${PN}@.service" - systemd_dounit "${systemdServiceFile}" - - local systemdUserFile="etc/linux-systemd/user/${PN}.service" - systemd_dounit "${systemdUserFile}" -} - -pkg_postinst() { - elog "In order to be able to view the Web UI remotely (from another machine)," - elog "edit your ${config} and change the 127.0.0.1:8080 to 0.0.0.0:8080 in" - elog "the 'address' section. This file will only be generated once you start syncthing." -} - diff --git a/net-p2p/syncthing/syncthing-9999.ebuild b/net-p2p/syncthing/syncthing-9999.ebuild deleted file mode 100644 index 82956f3..0000000 --- a/net-p2p/syncthing/syncthing-9999.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: This ebuild is from mva overlay; $ - -EAPI="5" - -vcs="git-r3" -SRC_URI="" -EGIT_REPO_URI="https://github.com/syncthing/${PN}" - -inherit eutils base systemd ${vcs} - -DESCRIPTION="Open, trustworthy and decentralized syncing engine (some kind of analog of DropBox and BTSync)" -HOMEPAGE="http://syncthing.net" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND=" - dev-lang/go - dev-go/godep -" -RDEPEND="${DEPEND}" - -DOCS=( README.md AUTHORS LICENSE CONTRIBUTING.md ) - -export GOPATH="${S}" - -GO_PN="github.com/syncthing/${PN}" -EGIT_CHECKOUT_DIR="${S}/src/${GO_PN}" -S="${EGIT_CHECKOUT_DIR}" - -src_compile() { - # XXX: All the stuff below needs for "-version" command to show actual info - local version="$(git describe --always | sed 's/\([v\.0-9]*\)\(-\(beta\|alpha\)[0-9]*\)\?-/\1\2+/')"; - local date="$(git show -s --format=%ct)"; - local user="$(whoami)" - local host="$(hostname)"; host="${host%%.*}"; - local lf="-w -X main.Version ${version} -X main.BuildStamp ${date} -X main.BuildUser ${user} -X main.BuildHost ${host}" - - godep go build -ldflags "${lf}" -tags noupgrade ./cmd/syncthing -} - -src_install() { - dobin syncthing - systemd_dounit "${S}/etc/linux-systemd/system/${PN}@.service" - systemd_douserunit "${S}/etc/linux-systemd/user/${PN}.service" - base_src_install_docs -} -