diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2014-06-16 17:04:13 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2014-06-16 17:04:13 +0000 |
| commit | ea5647969eac37d0ddfe27a930c2e877d16ded7c (patch) | |
| tree | 7aee6257f340d9c46955b1e0d61ac965a4a8e666 /net-libs/libcapi | |
| parent | ppc/ppc64 stable wrt bug #496212 (diff) | |
| download | gentoo-2-ea5647969eac37d0ddfe27a930c2e877d16ded7c.tar.gz gentoo-2-ea5647969eac37d0ddfe27a930c2e877d16ded7c.tar.bz2 gentoo-2-ea5647969eac37d0ddfe27a930c2e877d16ded7c.zip | |
Add block dependency on net-dialup/capi4k-utils, due to the same name for result library. Drop old revision
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-libs/libcapi')
| -rw-r--r-- | net-libs/libcapi/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/libcapi/libcapi-3.0.7-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-libs/libcapi/libcapi-3.0.7.ebuild | 21 |
3 files changed, 10 insertions, 23 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/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" ) |