gentoo resync : 14.04.2018

5 files changed, 5 insertions, 116 deletions

diff --git a/net-libs/ccnet/Manifest b/net-libs/ccnet/Manifest
index d19a5d0a8a61..d981edeeb290 100644
--- a/net-libs/ccnet/Manifest
+++ b/net-libs/ccnet/Manifest
@@ -1,9 +1,3 @@
-DIST ccnet-6.0.7.tar.gz 179356 BLAKE2B cc7a3fb70013e575845c8fd638847f1fd9670b0ea1997d208fd89f917f1c4c60ed86064c31db118bf5969dda27bc055d5e3abf0bb1ad63bc00ad49ba5819dda6 SHA512 66df998bb544ad614479d853820e3ee3119c2b08087d82a2a0633202c860447a7ac79f3639e587d531c2443def3cd58bf9ccdb2fed350c8bd7005737fb3d85fd
-DIST ccnet-6.1.0.tar.gz 179362 BLAKE2B a7c10433a3af69456f15df75c02d92e203628f7f4d64a9f57849cc80e8d0913fccc7767b58e161551a2105cbffd79074144237fbacba5663972eadea661131d1 SHA512 0053d342cf9256a37ca2ebf774794c791cb08caa7d608035c1b307a271e11719da1d4c272870ab51ad1cd8d8c0a84d22959b513865ddf98b4691cba35bc93018
-DIST ccnet-6.1.3.tar.gz 179321 BLAKE2B 23f6877ee9e3d80d4413e7b059688d83f99e21f3b665abaf41389366cf99fcb841e730535808e6874f4c1ba09818f637bbf222858ebb1ec3473cd40b6b03d0b0 SHA512 1700237749dd250798b6bd3ea2d74bd09f72e3f5502520d413671c247eeeae05f92947a4a4429035f8ab6414c9c67353939025de046b00941956b6854f4cfcc3
-DIST ccnet-6.1.4.tar.gz 179357 BLAKE2B 5f0a83ef15f43394655c68d2b2a13ca91e0df93fb661f598814d8f0c4a31eddb26d0b8a0f0679d9c3babf7200f8ce1bb75818e0a6d445f41527358b4c6102d2c SHA512 99ec3f41ad1e6c06455ca1622b6e5219d76ce85014523db6bfd15cbbd9b54fd4027f87906fc47bd7bafcbabc9febdbccb6839c5b8fa10133ddb461dca4f46ce0
-EBUILD ccnet-6.0.7.ebuild 873 BLAKE2B 679326c2ced8f7b7b246f56b6c27b09352e4a49108d722236c951637f31856e2fe38b85da6869a236fea6857618bcf07a2b797a7fd73c6e028b931679a77d090 SHA512 6ebabe35a41860198c5f32a01c59ef0505b78238747dcbe705570d42b42dcd61cf89a4faee2036b7e04b7294eaad88aa471135abba20739745352fd4d2b8f593
-EBUILD ccnet-6.1.0.ebuild 873 BLAKE2B 679326c2ced8f7b7b246f56b6c27b09352e4a49108d722236c951637f31856e2fe38b85da6869a236fea6857618bcf07a2b797a7fd73c6e028b931679a77d090 SHA512 6ebabe35a41860198c5f32a01c59ef0505b78238747dcbe705570d42b42dcd61cf89a4faee2036b7e04b7294eaad88aa471135abba20739745352fd4d2b8f593
-EBUILD ccnet-6.1.3.ebuild 1009 BLAKE2B 60ac3868b2b59dbf88a6baf296323e63f9c0146a5f34b337332c295662eab76678e556c436f2289ee8f37f830d67cb9af72beb2a3c3f55e3e956dfa03b0ab3aa SHA512 93985895949b2eacde0c1e73713627b9d46f43584293c2a0c51712302c444d7324331fa07c638dfb4be7df0614b776a99bd15df6d0465e1f7ecd2b60b643e58c
-EBUILD ccnet-6.1.4.ebuild 1009 BLAKE2B 60ac3868b2b59dbf88a6baf296323e63f9c0146a5f34b337332c295662eab76678e556c436f2289ee8f37f830d67cb9af72beb2a3c3f55e3e956dfa03b0ab3aa SHA512 93985895949b2eacde0c1e73713627b9d46f43584293c2a0c51712302c444d7324331fa07c638dfb4be7df0614b776a99bd15df6d0465e1f7ecd2b60b643e58c
+DIST ccnet-6.1.7.tar.gz 179364 BLAKE2B 214284a5b04ee2c8a51f8479bee5bcc3d5b044ed0cd622b56ae5caf4fb2757bf28191ffedca9f76fce80b5c6da5a489207e1bdef3436e44dbe1841a69a82c448 SHA512 bac93c9987f434915f9d5b5f0cfc44d88471ae27896e89059f3c924182255d938fb6c87dec31354f256807d5e4274b6af2e3325e753d06cd8a5ea91caba9490d
+EBUILD ccnet-6.1.7.ebuild 995 BLAKE2B 259e0ff75a805902d29bfe659510ebeb801c77894b3d863cecb3650312818c3fb4bf17c067f9ea1ddffb1bacb212022698420dda075ae42632402311621e59e1 SHA512 ed7642aa5269055f57612d853412a7ca99b808fc72bdb424a2b75e1c63caba7c5c744f09ea4bb0d47f22b82bfbb73641947a0be6b43d2c473fb71d0de93f0029
 MISC metadata.xml 414 BLAKE2B 4a36924c507e6d008c32aa08bd7216b525c9b987229cb9158393d3b0abbca75ecafbf9ff9f7b687afa53b73d41a32588960f7abd9bd365b795f87cb064d79a93 SHA512 d3687845c8d2b3f8bed69df446341ebcea3fa151bf956d2c87c4aeca43c4a5af29cec35e9dc894b7f95d97e2f144324e78cb0d68d62c08c7db3c86f3587b045f
diff --git a/net-libs/ccnet/ccnet-6.0.7.ebuild b/net-libs/ccnet/ccnet-6.0.7.ebuild
deleted file mode 100644
index e78f3357f6ea..000000000000
--- a/net-libs/ccnet/ccnet-6.0.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
diff --git a/net-libs/ccnet/ccnet-6.1.0.ebuild b/net-libs/ccnet/ccnet-6.1.0.ebuild
deleted file mode 100644
index e78f3357f6ea..000000000000
--- a/net-libs/ccnet/ccnet-6.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
diff --git a/net-libs/ccnet/ccnet-6.1.4.ebuild b/net-libs/ccnet/ccnet-6.1.4.ebuild
deleted file mode 100644
index 111ba4108381..000000000000
--- a/net-libs/ccnet/ccnet-6.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/ccnet/ccnet-6.1.3.ebuild b/net-libs/ccnet/ccnet-6.1.7.ebuild
index 111ba4108381..76149b4a86fe 100644
--- a/net-libs/ccnet/ccnet-6.1.3.ebuild
+++ b/net-libs/ccnet/ccnet-6.1.7.ebuild
@@ -17,9 +17,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	net-libs/libsearpc[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libevent-2.0
-	dev-libs/openssl:0=
+	dev-libs/glib:2
+	dev-libs/libevent:0
+	dev-libs/openssl:0
 	dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 	$(vala_depend)"