Add block dependency on net-dialup/capi4k-utils, due to the same name for result library. Drop old revision

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 19 insertions, 33 deletions

diff --git a/net-libs/libcapi/ChangeLog b/net-libs/libcapi/ChangeLog
index c369204e63e2..16408b71a9e3 100644
--- a/net-libs/libcapi/ChangeLog
+++ b/net-libs/libcapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libcapi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapi/ChangeLog,v 1.2 2014/01/26 09:28:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapi/ChangeLog,v 1.3 2014/06/16 17:04:12 pinkbyte Exp $
+
+  16 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> -libcapi-3.0.7.ebuild,
+  libcapi-3.0.7-r1.ebuild:
+  Add block dependency on net-dialup/capi4k-utils, due to the same name for
+  result library. Drop old revision
 
 *libcapi-3.0.7-r1 (26 Jan 2014)
 
diff --git a/net-libs/libcapi/Manifest b/net-libs/libcapi/Manifest
index cb51d7e9c61a..ffbc3521b43c 100644
--- a/net-libs/libcapi/Manifest
+++ b/net-libs/libcapi/Manifest
@@ -3,18 +3,17 @@ Hash: SHA256
 
 AUX libcapi-3.0.7-remove-libcapi20dyn.patch 890 SHA256 5630fbf3394580a928fc080cab49936a416eb375251210c346137786751a5b04 SHA512 7e5216d7dab21d397da85b6b8c6c5a3e4cd3b0a724ff30baeb9a4651981e1cf3cdae64f6b2a628026132e492d49f142a249db0a99f82cdb281efeddacd3a986e WHIRLPOOL 90980cf45c1502da84e583568dfbd505c6508f8977a4c216c5aa5dfb9705c0edce18df071c9886251a752467189afa6cee173ae30c07f3945301fbe0f49c2a14
 DIST libcapi20-3.0.7.tar.bz2 474174 SHA256 f36c7d1d8a46dd76b1e3443d6f5478ad16177d3f91c9f67bc654608167020293 SHA512 c14e493f34fbd8477aed8efc0e6ee8dc07c6007be75610d59a15ce23f48cd5cd53da1b1ac64c11e7516df5aff40877c76ce7a6d72b5c7b1d24beee7592a51bbe WHIRLPOOL 7ba7530ea680a22d0538af8d14e66b51735c7e125f9450d845794a96c964dcf968daf4a02afd1b2a00e66b9898d5b6d00074aab418363c100815a2301d7ab3b4
-EBUILD libcapi-3.0.7-r1.ebuild 605 SHA256 fcd166ae166f32ddbd1e14bd8a96571c4947c71f4519840c51b5a4cafe0d4779 SHA512 30e7baf4eb5bdf1f25abc2a87ba61196576fc2f470c374abbb557b8d7fee9a96105823532fa35919eb6be4c1b27e9e3d5dc85b7aae3dcc6bb864987f1a988746 WHIRLPOOL 838814cda4690130ea0f282ff77ea60ee8d28b3c754b26a7bbc3c4da1dbe3dbe6eb8ba462a72415df8e5ac20ae61f1c5ef52d9c438a8655a73ee898c37af20ae
-EBUILD libcapi-3.0.7.ebuild 599 SHA256 e60c07e3122563121ad62ff9fef4d9594a6e061579726412b25782dd9beaa4e0 SHA512 0452d65c5d3be75d71f9eaf1c962b99a6238cf5f91c7d431d3fcf3c8723391578347b4647e593da4252f095032d2548b9ccdb6bf557eeda6b24c9a802f787424 WHIRLPOOL f53b5f2339ba34b944507327c954c9a0455ce54585569cf3af3bb50608f317efb2b4eb0d2d5cb81458e25dc66b35cabf72f629ee7c8917b8fbf02de67aff6a0b
-MISC ChangeLog 634 SHA256 58869508a9dff885c98cdb607076c9b02991a0f964622a52d46f3e1460a702b2 SHA512 a7a281b799d1b26672e8bb181bc3e745179f2907317d475ea12aee6cd80263ec5b795c1b959e921d8eb9b5b68fb333636bc7ec9668d342480ab8d9ed56218898 WHIRLPOOL 36c24cd1cbe32f90d43cfc84343a2c3a43470d79747ec19b7576163c3a572a24f144d7de4df925018aae6c581a93bccc779b312b57dab5a0278caef0c2b6898c
+EBUILD libcapi-3.0.7-r1.ebuild 661 SHA256 d31f0d886a354ba26a7fbb790ec61dd553d66a13dec1c5a976906d919ff2a834 SHA512 d810ca2d08f4e756361717bc12f25b6cbaf5acf66ee704bd39dee7d2409799ae20d2120ad8fca3c077fe4f2d3219c71e1344546d58d43b9b7c2d1ff392a53637 WHIRLPOOL 307414468265b49c6362ced9fca3389fc7574095bcf58a51ce7563bb96f98654f26b3b9bae8a62445635aaf12339d2ba3b44e8f3ddeb3f4741de7a214cbbb319
+MISC ChangeLog 847 SHA256 5d935482f8d30fc5b8baba2e9b64802769dd66c14eeeeba584846d85a681af7d SHA512 1da11e85e1fcfa1835ea359f653646f9975f3028b210527f227b038dda5e5a6287808ceaf1f70f3bb4bc9ce2516d48f016de30ca00f5f2fec258d3c870a03a39 WHIRLPOOL 92b9dcdc7912fb11aea3eea9df1e1d5b0351e71ca62bc44c3e5a650ab6b2a66c382a43b4ffc7361384bc17a5d168fa64d91e6d055b3e9dfc56feb3d9ad0f6d44
 MISC metadata.xml 164 SHA256 e656206746cf89d8b3282096ede2d8c13ca15e39b481452ddceff44f6aee25e6 SHA512 8b28205b8d95065570c8c9298c8c5de78f999335defc518d6bc8bdb41bb4497d380a4774a45936564f38db63e3a4fdce5bd37af210f7d8195a3741a46332d890 WHIRLPOOL a7c61a37f1c58a4bde7a5fe956642facfa08cedfd9a2b79001ae38155b37d8e0ec8077e01425af1669e056b791621e554fc858777ac904eedf1e6acb2011c94d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS5NVUAAoJECo/aRed9267SxwH/2PnfWDw8Q9eqhMPjWqpduJT
-tQTUD+PwpDGJUqm/PRJLg0nePyzkVXt+YX/FMbxbTQa1ydGI0tGuPuUh3fKm8wlG
-xuyXn7zWCFwufJTfE9Dp5G8eeiCUXZOxEOxV0+fzhCjuumnZaA6rJAd6k8POFHq0
-LCA+92r+TAHggShOPZWwwGU9QjeubT7r9rgxhix8RBog/HNUs3zXM4FyDRPJIssN
-1oDRRir/MIdj3/MjJOpFeY8Cu7Wi3SQXVYY1bqaeOZyUNlJQqh9uObM+LjrO50h3
-xR6g0dNW//vtuWpPQwudcyktvlRiSiSfsHiN+zArTKWYRzqD1+KhbT3aGKAbqr0=
-=PNjN
+iQEcBAEBCAAGBQJTnyOOAAoJECo/aRed9267WNIIAJEB08cFe2svb6nUc7+tKzKZ
+25XVl9W88oVSvXTJhZuu0vkrvWBPoGdBbmtcK0Zac16vuDglg1YOxH4GJclI9mwM
+6KXDHQtzKp52Y1vrcqTXmDOtHvM1HeYabh7IuAsec6b8JwiVIw48beMrGnfKyBHL
+SZoOQT378BczBDZZho6h6mnMSdLruY6TTgoubPfPXcFa3ZQAPnEak3FqiKQRKsoO
+jvzCV09EC6tLpmE51CC9TzM2ccAE2zvhGRuQ1uHWQQejrpLdPgCeEOWFFsXkb1mJ
+L96rmsyKscqEo5BDSpAUFGr9/9OI7JCF7sNuuCJIvOWP92HF55DMd7aeiH3BVCk=
+=lDXH
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
index d27ae006693b..0c23b4a21fa8 100644
--- a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
+++ b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapi/libcapi-3.0.7-r1.ebuild,v 1.1 2014/01/26 09:28:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapi/libcapi-3.0.7-r1.ebuild,v 1.2 2014/06/16 17:04:12 pinkbyte Exp $
 
 EAPI=5
 
@@ -18,4 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/capi20"
 
+RDEPEND="!net-dialup/capi4k-utils"
+DEPEND="${RDEPEND}"
+
 PATCHES=( "${FILESDIR}/${P}-remove-libcapi20dyn.patch" )
diff --git a/net-libs/libcapi/libcapi-3.0.7.ebuild b/net-libs/libcapi/libcapi-3.0.7.ebuild
deleted file mode 100644
index e2a04d71b8cc..000000000000
--- a/net-libs/libcapi/libcapi-3.0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapi/libcapi-3.0.7.ebuild,v 1.1 2013/04/09 06:43:21 pinkbyte Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils
-
-DESCRIPTION="CAPI library used by AVM products"
-HOMEPAGE="http://www.tabos.org/ffgtk"
-SRC_URI="http://www.tabos.org/ffgtk/download/libcapi20-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/capi20"
-
-PATCHES=( "${FILESDIR}/${P}-remove-libcapi20dyn.patch" )