[gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/files/, net-p2p/airdcpp-webclient/
commit: 0d79b09fdbb16cf2148883583177f20b5546028f
Author: Henrik Wennergren protonmail com>
AuthorDate: Thu Sep 28 21:01:03 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 10:32:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d79b09f
net-p2p/airdcpp-webclient: Fix incorrect conf parameter name in init file
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5830
.../airdcpp-webclient-2.1.0-r1.ebuild | 68 ++
.../airdcpp-webclient-2.2.0-r1.ebuild | 65 +
net-p2p/airdcpp-webclient/files/airdcppd.initd | 4 +-
3 files changed, 135 insertions(+), 2 deletions(-)
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0-r1.ebuild
b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0-r1.ebuild
new file mode 100644
index 000..5bcf75f9add
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit cmake-utils python-any-r1 user
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://airdcpp-web.github.io/;
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="nat-pmp +tbb +webui"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-cpp/websocketpp
+ dev-libs/boost:=
+ dev-libs/geoip
+ dev-libs/leveldb:=
+ dev-libs/openssl:0=[-bindist]
+ net-libs/miniupnpc:=
+ sys-libs/zlib:=
+ virtual/libiconv
+ nat-pmp? ( net-libs/libnatpmp:= )
+ tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+# https://github.com/airdcpp-web/airdcpp-webclient/pull/248
+PATCHES=( "${FILESDIR}/${P}-disable-automagic.patch" )
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ enewgroup airdcppd
+ enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_WEB_UI=OFF
+ -DENABLE_NATPMP=$(usex nat-pmp)
+ -DENABLE_TBB=$(usex tbb)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+ newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+ keepdir /var/lib/airdcppd
+ fowners airdcppd:airdcppd /var/lib/airdcppd
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Run 'airdcppd --configure' to set up ports and
authentication"
+ fi
+}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.0-r1.ebuild
b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.0-r1.ebuild
new file mode 100644
index 000..fd8f46fe630
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit cmake-utils python-any-r1 user
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://airdcpp-web.github.io/;
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="nat-pmp +tbb +webui"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-cpp/websocketpp
+ dev-libs/boost:=
+ dev-libs/geoip
+ dev-libs/leveldb:=
+ dev-libs/openssl:0=[-bindist]
+ net-libs/miniupnpc:=
+ sys-libs/zlib:=
+ virtual/libiconv
+ nat-pmp? ( net-libs/libnatpmp:= )
+ tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ enewgroup airdcppd
+ enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_WEB_UI=OFF
+ -DENABLE_NATPMP=$(usex nat-pmp)
+ -DENABLE_TBB=$(usex tbb)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+ newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+ keepdir /var/lib/airdcppd
+ fowners airdcppd:airdcppd /var/lib/airdcppd
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Run 'airdcppd --configure' to set up ports and
authentication"
+ fi
+}
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.initd
b/net-p2p/airdcpp-webclient/files/airdcppd.initd
index
[gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/files/, net-p2p/airdcpp-webclient/
commit: 4f7edebf8bc8d3cbd90b9dbb3a2a87162b815018
Author: Louis Sautier gmail com>
AuthorDate: Wed Sep 6 19:25:52 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Sep 16 10:13:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7edebf
net-p2p/airdcpp-webclient: remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-p2p/airdcpp-webclient/Manifest | 2 -
.../airdcpp-webclient-1.4.1-r1.ebuild | 69 --
.../airdcpp-webclient-2.0.1.ebuild | 63
.../airdcpp-webclient-1.4.1-fix-zlib-errors.patch | 23
4 files changed, 157 deletions(-)
diff --git a/net-p2p/airdcpp-webclient/Manifest
b/net-p2p/airdcpp-webclient/Manifest
index e82bac8901e..ad7df2341b2 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,4 +1,2 @@
-DIST airdcpp-webclient-1.4.1.tar.gz 743631 SHA256
9acb61366c91a7aaa03cae58e9aee28ccac05ffe9dff0ec947836fa81967f27f SHA512
7b973251574cb5b49942efa868cef9f689fcf8d804be632ad17c445be98ab55ca9973c5fe9dce052d542006d47a7850af7d236953010c2c0e3158c54e448afe1
WHIRLPOOL
e43ccfddc50dbdd0ce8a3cd5b00fc4c844ed69051967d67cca9c9c72b073227d1d20ac510d34b07161c231c7c7d69b945d60872d8756a0ef2c91dfe4a843fe06
-DIST airdcpp-webclient-2.0.1.tar.gz 843348 SHA256
312466c20b6c3125b6bf88b26f23618f67546722bb0372089537c5a88cc3460b SHA512
2c31712816a59560f248f42b3ad3ffe5d2f76a64860bf515a537b79dda5a579bac17d5d8ba46d9d57554a0b93b9384696a299b2f2096e05c62ea4b97e42d06bc
WHIRLPOOL
e78d998d8398eb705599ed0f249242d460586288c5649b810606321334a7ea66bd2cb9f119789eec19038e1e3d9ce376a93e96bd18fe15bba10d7a80c97ee580
DIST airdcpp-webclient-2.1.0.tar.gz 844435 SHA256
a8d8a33e3974d23009359709da0bee85e8983e3ea1fe78f21a867078f93b81fa SHA512
75d30183e772ad5d2e38a813f548e3322ca034b759200f289a834ae21b64f56102f57a13832a837e8a11324efe74a860e941a0f28a02d1f843aed92a328f
WHIRLPOOL
5a0a61bcf0ad1de1706786fc2080aeba0ae634386957876a20d1ca638d3fc8b724f5c866d59588f4958a6010fc192d474f1cfe7ff04d4403106ba631b800739b
DIST airdcpp-webclient-2.2.0.tar.gz 844968 SHA256
77cde1acd8730370e87e3546f9895bb993a459ad8f70e1713803ec3ba0a849cb SHA512
a7fc608109ee5823f844bd575d9355d0cbb4094c89e5dcba522018685d969974e82d3dea56bd334591a424010e0b43858f227e2bb66d738c0151c1456175800d
WHIRLPOOL
040076d1fd2d7973ccaa6dd0935c0f2b1828c6e4d3bff6de362fd53656d54bf9a9c5733c23fbee35fd6ece897fd5a2ca2b277ceeda51b03c66277f2c81759eb3
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild
b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild
deleted file mode 100644
index cd9fd803d0b..000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
-
-inherit cmake-utils user python-any-r1
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/;
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="nat-pmp +tbb +webui"
-
-RDEPEND="
- app-arch/bzip2
- dev-cpp/websocketpp
- dev-libs/boost:=
- dev-libs/geoip
- dev-libs/leveldb
- dev-libs/openssl:0=[-bindist]
- net-libs/miniupnpc:=
- sys-libs/zlib
- virtual/libiconv
- nat-pmp? ( net-libs/libnatpmp )
- tbb? ( dev-cpp/tbb )
-"
-DEPEND="
- virtual/pkgconfig
- ${PYTHON_DEPS}
- ${RDEPEND}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-# Fix errors with zlib >= 1.2.10
-# https://bugs.launchpad.net/dcplusplus/+bug/1656050
-#
https://github.com/airdcpp/airdcpp-core/commit/5b48aa785a2d6248971423fd5b7e07af32a6c289
-#
https://github.com/airdcpp/airdcpp-core/commit/e80e3d2f6492b5c4f56489338bc2825583526831
-PATCHES=( "${FILESDIR}/${P}-fix-zlib-errors.patch" )
-
-pkg_setup() {
- python-any-r1_pkg_setup
- enewgroup airdcppd
- enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
-}
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_WEB_UI=OFF
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- newconfd "${FILESDIR}/airdcppd.confd" airdcppd
- newinitd "${FILESDIR}/airdcppd.initd" airdcppd
- keepdir /var/lib/airdcppd
- fowners airdcppd:airdcppd /var/lib/airdcppd
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Run 'airdcppd --configure' to set up ports and
authentication"
- fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.0.1.ebuild
b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.0.1.ebuild
deleted file mode 100644
index 48eaa65f1fe..000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.0.1.ebuild
+++ /dev/null
@@
[gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/files/, net-p2p/airdcpp-webclient/
commit: 6a014f15595971edd3b1cc957bb65c8122a8da02
Author: Louis Sautier gmail com>
AuthorDate: Sat Jun 10 11:40:20 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Jun 24 05:36:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a014f15
net-p2p/airdcpp-webclient: bump to 2.1.0, add Python 3.6, minor changes
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-p2p/airdcpp-webclient/Manifest | 1 +
.../airdcpp-webclient-2.1.0.ebuild | 68 ++
...airdcpp-webclient-2.1.0-disable-automagic.patch | 40 +
3 files changed, 109 insertions(+)
diff --git a/net-p2p/airdcpp-webclient/Manifest
b/net-p2p/airdcpp-webclient/Manifest
index 80f155d9f18..e223aa66ff5 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,2 +1,3 @@
DIST airdcpp-webclient-1.4.1.tar.gz 743631 SHA256
9acb61366c91a7aaa03cae58e9aee28ccac05ffe9dff0ec947836fa81967f27f SHA512
7b973251574cb5b49942efa868cef9f689fcf8d804be632ad17c445be98ab55ca9973c5fe9dce052d542006d47a7850af7d236953010c2c0e3158c54e448afe1
WHIRLPOOL
e43ccfddc50dbdd0ce8a3cd5b00fc4c844ed69051967d67cca9c9c72b073227d1d20ac510d34b07161c231c7c7d69b945d60872d8756a0ef2c91dfe4a843fe06
DIST airdcpp-webclient-2.0.1.tar.gz 843348 SHA256
312466c20b6c3125b6bf88b26f23618f67546722bb0372089537c5a88cc3460b SHA512
2c31712816a59560f248f42b3ad3ffe5d2f76a64860bf515a537b79dda5a579bac17d5d8ba46d9d57554a0b93b9384696a299b2f2096e05c62ea4b97e42d06bc
WHIRLPOOL
e78d998d8398eb705599ed0f249242d460586288c5649b810606321334a7ea66bd2cb9f119789eec19038e1e3d9ce376a93e96bd18fe15bba10d7a80c97ee580
+DIST airdcpp-webclient-2.1.0.tar.gz 844435 SHA256
a8d8a33e3974d23009359709da0bee85e8983e3ea1fe78f21a867078f93b81fa SHA512
75d30183e772ad5d2e38a813f548e3322ca034b759200f289a834ae21b64f56102f57a13832a837e8a11324efe74a860e941a0f28a02d1f843aed92a328f
WHIRLPOOL
5a0a61bcf0ad1de1706786fc2080aeba0ae634386957876a20d1ca638d3fc8b724f5c866d59588f4958a6010fc192d474f1cfe7ff04d4403106ba631b800739b
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild
b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild
new file mode 100644
index 000..cee109040c4
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit cmake-utils python-any-r1 user
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://airdcpp-web.github.io/;
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="nat-pmp +tbb +webui"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-cpp/websocketpp
+ dev-libs/boost:=
+ dev-libs/geoip
+ dev-libs/leveldb:=
+ dev-libs/openssl:0=[-bindist]
+ net-libs/miniupnpc:=
+ sys-libs/zlib
+ virtual/libiconv
+ nat-pmp? ( net-libs/libnatpmp:= )
+ tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+# https://github.com/airdcpp-web/airdcpp-webclient/pull/248
+PATCHES=( "${FILESDIR}/${P}-disable-automagic.patch" )
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ enewgroup airdcppd
+ enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_WEB_UI=OFF
+ -DENABLE_NATPMP=$(usex nat-pmp)
+ -DENABLE_TBB=$(usex tbb)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+ newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+ keepdir /var/lib/airdcppd
+ fowners airdcppd:airdcppd /var/lib/airdcppd
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Run 'airdcppd --configure' to set up ports and
authentication"
+ fi
+}
diff --git
a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.1.0-disable-automagic.patch
b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.1.0-disable-automagic.patch
new file mode 100644
index 000..4e8360e6967
--- /dev/null
+++
b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.1.0-disable-automagic.patch
@@ -0,0 +1,40 @@
+commit 8ca829a832db304769ac0d107471ab23d4ce3cce
+Author: Louis Sautier
+Date: Wed Jun 21 23:10:03 2017 +0200
+
+Add options to disable libnatpnp and tbb support
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d8a49c7..826fce3b 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -47,6 +47,10 @@ endif()
+
+
+ # OPTIONS
++OPTION(ENABLE_NATPMP "Enable support for the NAT-PMP protocol via libnatpmp"
++ ON)
++OPTION(ENABLE_TBB
