version bump & drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

4 files changed, 28 insertions, 71 deletions

diff --git a/net-proxy/shadowsocks-libev/ChangeLog b/net-proxy/shadowsocks-libev/ChangeLog
index 00c16b9306ba..ec5ea663e38d 100644
--- a/net-proxy/shadowsocks-libev/ChangeLog
+++ b/net-proxy/shadowsocks-libev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/shadowsocks-libev
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/shadowsocks-libev/ChangeLog,v 1.2 2015/01/11 14:02:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/shadowsocks-libev/ChangeLog,v 1.3 2015/04/13 02:56:50 dlan Exp $
+
+*shadowsocks-libev-2.1.4 (13 Apr 2015)
+
+  13 Apr 2015; Yixun Lan <dlan@gentoo.org> -shadowsocks-libev-1.6.4.ebuild,
+  -shadowsocks-libev-2.0.4.ebuild, +shadowsocks-libev-2.1.4.ebuild:
+  version bump & drop old
 
 *shadowsocks-libev-2.0.4 (11 Jan 2015)
 
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 900d5fa255b9..942b5ac933cb 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -3,26 +3,26 @@ Hash: SHA256
 
 AUX shadowsocks.initd 1206 SHA256 e26f1a44dd0e8321de97753149fcfe839a6b50157a3b1238d2bd2af4e05d8331 SHA512 2d1fb439adac429dd33db07e19f498bae77c2f46d7c023dfc3c4944d7e0cf02ce0d8655be477ae3db37daa8de5ea3aad5f3e3566c6a01991f54439aa6bdd1a69 WHIRLPOOL 4a0c46d6319cccc0b7d88c899af17b6e5b45b90bbcfe7ca69ef1cd746da505c0a3c75af0b9a13eb9b899debe472ac973d221c93a04ead4f9ee29923dd185baac
 AUX shadowsocks.json 132 SHA256 a17bf075e7dda6e1440949598c0ab770df18e15f69a41624f9daead610ff9ea4 SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef WHIRLPOOL e09449b396d6bd7eec06b59783256249715e2c885a3bd3c51df5555f464f9a1c1278cae9208785639c60b14705e3daf40e29054fe20858b289185462aee601bf
-DIST shadowsocks-libev-1.6.4.tar.gz 2404815 SHA256 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7 SHA512 757ab76087d743e0590daf66e7d63beac1c5f7ef76b4e5ffd0df80867b978ec8b1b1aad391911e58fb2f1fded2c54c180fb93474790c9b7d84436d96a367d42f WHIRLPOOL 57c4858888a20a23bb17deb79f28477c62ae370778b9c992012ea37853a9c51a907e5ae093ca12d932d0daf05b68a11c7fb42de103c1e7fe2510b8f970e51fc4
-DIST shadowsocks-libev-2.0.4.tar.gz 2479831 SHA256 9803d7211ba7200ac83a30953feb265a86c575913b8f6dc52d734583344c9c59 SHA512 94d97a4dbeb35ae3a5356bdcaffc62175b7d8d9ed6960fc038b894892659b9625eecb1648868364ad1a13efb0a611a1e51d6a24d50ff79817ad34fa2bf99ab89 WHIRLPOOL 81d671edb72d7d6ec3362bea6b141135408dce6bf91d25fa4eb954c70d108491d926160f01884eae1354ad24c11d156bd84125e41db6abb13b52a80aaccfce54
-EBUILD shadowsocks-libev-1.6.4.ebuild 1350 SHA256 5e484b61fc3cfe97b830f250f7c36260da1bda62729a008264be443dc0b605de SHA512 5f5e196cdb0e9122b38b9b9248c099e67acf2316d95ab10db393095f2b97c6d302f03e1079cd620a0c268349c6b1f9ff2f9b09a3ec26365083f72fc12ff7b930 WHIRLPOOL e3df3e24570c6f1ed1d0bb26ad298a6399d16411a1de8bb52c3ac5fa72946986bc06edd5e00c8e334e3151b91c91b77e6416dad573c97637f63157f15e34352a
-EBUILD shadowsocks-libev-2.0.4.ebuild 1350 SHA256 84880ee1739ae9de793fa94691a56be78ca28017128ebd68f400163dc14d68f7 SHA512 79d14498317d45a977fe137a4feaf8113c47d128026645df2b502a7f5cca7a8af9304bf57e26fe8558ef4766ca104d9bf89ab9c42222aece6b927c660410f2fa WHIRLPOOL 9e1d29beb2486ba3461873eb0b9c25d98339012287f44de3a271317c21cf273ab4d4a7ccb743156ea76512aa0ced4ff004b88607e1fba4678fae09af31706df1
-MISC ChangeLog 607 SHA256 6f84df5f3bb5d08eac1cc8ef19889e9bce293fc60651dac84f1a6272f79b7c26 SHA512 be3421c87320735712d8c4fc2d37920ff8de894394b962ff47cb716d5b25dc6cc165605dcc43cd1b3bacde8512fe9639e041fefd6bb0af2ba1f2d4341962d788 WHIRLPOOL 6410be2ebbf9692de5d75c5b4d11ff8b1eb1a284eee43ee5128110dd158e1fa9653c967088f0f314684e25de09c27286953105a9ebbbb553ec59293af66ef08a
+DIST shadowsocks-libev-2.1.4.tar.gz 2488477 SHA256 d4e665e375224ba1d4844b97e7263491ce07a60f08c9cb55c3128a6d3aad13e7 SHA512 236fadcae423e462fb47991617177b9d580c328b588e8bcb2314ab68c56702c387c7592117350b7fe966299b6a0c9504db8be363a02aad1852f87153ce1b4d35 WHIRLPOOL 63a5c909b7e2eb33fc8cec125988d299eef6f01ccaba815158245b7010cf63ec800a4bcff097ca7a2cff2df5a1e3e5fab12c71a88ae3df7c1a6d168685dea9d0
+EBUILD shadowsocks-libev-2.1.4.ebuild 1352 SHA256 aee1e8af282f232483c3996028436829600ad2e8371c6fe96c82f4a3b3778f1a SHA512 f70c40311b03a36ae6967b309e7bda5786359e8966f84fbfadbbce73c62ba7eac4eb9dd07b9cc94ba2261fa5759133c87885895e68fe2707ef6846cb15c6ae57 WHIRLPOOL ffdf7c97192e012f9522f3adeda803a94d76c01fe281c533b433a3da18703e30539f3acb0a039758c6dd8a88236cd473080aea1e328880c6bcd6316fc846ed45
+MISC ChangeLog 818 SHA256 d88ad03c3f5b6c96d7058ce947c860bcdb5e32fdbc6f58f6a3ac2a195647f315 SHA512 1cad67f12daf44937c2d9724899b6811494f0fa6ae6f399be1528df6786366fb21c3518473d61a094dda1b1ecccf5e5d1583b527258a2397908e6fba518616de WHIRLPOOL 1ac55db7f625e26ee6bfce2d6f4493f1bb65ad00c733f8bf8b1886c05459d725634f3b125e153614f604ab710f1601968db0273854215cb9fbc3f2cb86dc1cce
 MISC metadata.xml 456 SHA256 9803e2497a04d55f147c999acda6dd23a1436b9a0bae009f7474d264b115a404 SHA512 1850a7eda0a0c60bb7ffd3563ae1c3257d4951ca5fe567fc1db4a7226119aedbdec505069e0e447f2cbe9d1f66e8e866c7e606675b575aa756968d4711525c34 WHIRLPOOL 9e68caeec5aa3cc399b454ac4a6e31c7f930ced7863bf5663ee12916423ba294b8ec004e57d98b9eef73c4286bd9510f973f9b6c900a94e1b456f6471c4f0318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUsoKSAAoJEJIMDbyqvv1VobEQAMERh6ZQE3Rk+tZ1vQCLQTET
-mUqiFt0IlKDZIZ4nkxO16GH5mS17X4dYrqRsX0NxhaLTMsAIV1KKsJLx80W1ley5
-+jBoDQuCzqGGUWC6IzrEUxQz4cFxdI0Y2ZJwkhi/ai5z8N8b19/8SkVx6QDwkd3y
-Ph3okiENf3ROfbUUocRnrirv6nDqXltDPx+QUctVWJRFHE7Hx/UVjPr7TsI107sr
-F8L92TOpw4YwTkX+7tQjzipdiwhqUNFZbRuHGzsnrmtM2BuE56o/2qQFYFK69EQv
-8JP9i1QEqS9eOURSuJOpsoQlPboSI7gOo/C3l5KwT5bQlS0dSrs/axio+jAyQwu7
-qv9fFSTaCo8JQlGETW6tqqEhwvHeaA/KegszuWUIrrYRtoMjSU7mKyH/jqN7XCSo
-oHfBRRqxv5ZDOgA2b5tAaCzTr99SInWoE2EyhdOKVhV1CfMC6VAvq+9Q8STW0M5g
-RcVfaBFEIZ/sOIyDigGeDlnGlquvQC53FTQj0pLVYbYb4PRpmRZM4LD9piGEfNrX
-gXPKCEGYUiAzlazm22lRESHQM2EZFTLU8yswA2MCX0goqVqYjkB7c0Uo63PbPyNb
-GviPhGyKIOWUY0uKal1KtOXWtqXZTzjMJEXFBVM4UDF2FpK3MzLBX8k/3BZXB9zG
-IH7cWUaU9g8emuvyeVRn
-=Kyol
+iQJ8BAEBCABmBQJVK59UXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtn4MQAIx4rDAiNrzGx7DYuCpQe0lT
+4dm9flg3LbeTG4huEpkYHg7DbeZpOnjTsuFu8sRhXFxr0efCW8Q3MllEIwIhLVy2
+nzY6uWBTRn+2Fow75fZGrU/5TGJxFVWe54t3t/YiWox259gUF43UnFqEPD6ELpQn
+yeA8+0cbPBDnxujwQwt0yKO7xlCXfZln7u+5n1aP5EeKO4pfB3SjeYMjKmRXhrHS
+IiKG11Qho5k6VXgDi/80xxbpL/kn7ttoJvmqWmNM0c2ADmKSGfHAlvd+Jd3IauPM
+uWPsdqw5oNmLQ5UOETN/zXS3zl7wN7BHkfzyekAqPFglrqoBpyIgr2ILZG/G0Bi/
+l7uKCXgTsGAJmVRj0/X7IGuTXPjhKJ2URPkccRKoS5+2PNHjS7StC2ob7fQQ0KWI
+2TrlLg8PB+QkkKL1g4f4MpZ2/J6SVjc0hKnqTGqSNVYmbdNfN0hlTPvCvfvUzS/l
+Aqm8rs6KkE9Z92HDBe2zbZ12i1vFrXtdCpo4PJ1Xv5KwjoP70qVi9t3WIWwOjZAA
+qFkHVY8fvK3Omu5udvDEPDtHwu437G8RpXo/MSKndjRlbbHWVliYI/agPOy7lK89
+XKmaDu+n+aaGnWWfZH5e7akiu8zSJKCPNInERfAfR/WFl5zeMYsJsD64S2vplkp6
+fvnZa74p0daqq6ERufil
+=2tkt
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-2.0.4.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-2.0.4.ebuild
deleted file mode 100644
index 583308eea7a8..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-2.0.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/shadowsocks-libev/shadowsocks-libev-2.0.4.ebuild,v 1.1 2015/01/11 14:02:48 dlan Exp $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A lightweight secured scoks5 proxy for embedded devices and low end boxes"
-HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-
-MY_PV="v${PV}"
-SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +openssl polarssl"
-
-DEPEND="openssl? ( dev-libs/openssl )
-	polarssl? ( net-libs/polarssl )
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=" ^^ ( openssl polarssl )"
-
-src_configure() {
-	econf \
-		$(use_enable debug assert) \
-		--with-crypto-library=$(usex openssl openssl polarssl)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	insinto "/etc/"
-	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
-
-	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.server
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.client
-}
-
-pkg_setup() {
-	elog "You need to choose to run as server or client mode"
-	elog "  server: rc-update add shadowsocks.server default"
-	elog "  client: rc-update add shadowsocks.client default"
-}
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-1.6.4.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-2.1.4.ebuild
index e77a06b6c9e1..e2d4166086e5 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-1.6.4.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/shadowsocks-libev/shadowsocks-libev-1.6.4.ebuild,v 1.1 2015/01/08 09:34:06 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/shadowsocks-libev/shadowsocks-libev-2.1.4.ebuild,v 1.1 2015/04/13 02:56:50 dlan Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +openssl polarssl"
 
-DEPEND="openssl? ( dev-libs/openssl )
+DEPEND="openssl? ( dev-libs/openssl:= )
 	polarssl? ( net-libs/polarssl )
 	"
 RDEPEND="${DEPEND}"