[gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     364d519ede7b3932dcff0b15aad19c375b5de661
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri Mar 25 00:02:40 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 01:28:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364d519e

net-misc/i2pd: rm 2.5.1-r1 and misc old files

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 net-misc/i2pd/files/i2pd-2.4.0.service             | 18 -----
 ...h => i2pd-2.5.0-fix_installed_components.patch} |  0
 net-misc/i2pd/files/i2pd.conf                      |  4 --
 net-misc/i2pd/i2pd-2.5.0-r3.ebuild                 |  2 +-
 net-misc/i2pd/i2pd-2.5.1-r1.ebuild                 | 82 ----------------------
 5 files changed, 1 insertion(+), 105 deletions(-)

diff --git a/net-misc/i2pd/files/i2pd-2.4.0.service b/net-misc/i2pd/files/i2pd-2.4.0.service
deleted file mode 100644
index c5acee0..0000000
--- a/net-misc/i2pd/files/i2pd-2.4.0.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/var/run/i2pd.pid
-User=i2pd
-Group=i2pd
-PermissionsStartOnly=yes
-ExecStartPre=/bin/touch /var/run/i2pd.pid /var/log/i2pd.log
-ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd.pid /var/log/i2pd.log
-ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
-
-[Install]
-WantedBy=multi-user.target
-

diff --git a/net-misc/i2pd/files/i2pd-2.4.0-fix_installed_components.patch b/net-misc/i2pd/files/i2pd-2.5.0-fix_installed_components.patch
similarity index 100%
rename from net-misc/i2pd/files/i2pd-2.4.0-fix_installed_components.patch
rename to net-misc/i2pd/files/i2pd-2.5.0-fix_installed_components.patch

diff --git a/net-misc/i2pd/files/i2pd.conf b/net-misc/i2pd/files/i2pd.conf
deleted file mode 100644
index 10675e6..0000000
--- a/net-misc/i2pd/files/i2pd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-log = 1
-daemon = 1
-service = 1
-

diff --git a/net-misc/i2pd/i2pd-2.5.0-r3.ebuild b/net-misc/i2pd/i2pd-2.5.0-r3.ebuild
index 73d79de..d143616 100644
--- a/net-misc/i2pd/i2pd-2.5.0-r3.ebuild
+++ b/net-misc/i2pd/i2pd-2.5.0-r3.ebuild
@@ -34,7 +34,7 @@ I2PD_GROUP="${I2PD_GROUP:-i2pd}"
 CMAKE_USE_DIR="${S}/build"
 
 src_prepare() {
-	epatch "${FILESDIR}/i2pd-2.4.0-fix_installed_components.patch"
+	epatch "${FILESDIR}/i2pd-2.5.0-fix_installed_components.patch"
 }
 
 src_configure() {

diff --git a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild b/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
deleted file mode 100644
index 31385b5..0000000
--- a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd user cmake-utils
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
-			dev-libs/crypto++
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-			upnp? ( net-libs/miniupnpc )
-		)"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.46[static-libs,threads]
-		dev-libs/crypto++[static-libs]
-		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
-		upnp? ( net-libs/miniupnpc[static-libs] ) )
-	i2p-hardening? ( >=sys-devel/gcc-4.7 )
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
-
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
-	epatch "${FILESDIR}/i2pd-2.4.0-fix_installed_components.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	doman "${FILESDIR}/${PN}.1"
-	keepdir /var/lib/i2pd/
-	insinto "/var/lib/i2pd"
-	doins -r "${S}/contrib/certificates"
-	dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	doins "${S}/debian/${PN}.conf"
-	doins "${FILESDIR}/tunnels.cfg"
-	doins "${S}/debian/subscriptions.txt"
-	fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
-	fperms 600 "/etc/${PN}/${PN}.conf"
-	dodir /usr/share/i2pd
-	newconfd "${FILESDIR}/${PN}-2.5.1.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-2.5.1.initd" "${PN}"
-	systemd_newunit "${FILESDIR}/${PN}-2.5.1.service" "${PN}.service"
-	doenvd "${FILESDIR}/99${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}"
-}
-
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}