diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2015-03-05 07:49:33 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2015-03-05 07:49:33 +0000 |
| commit | 77fab5a6721ad1583340b71199aae4698d44e0e4 (patch) | |
| tree | 00ddca9f0163328ae8ebbf767ab691cb10cc2401 /net-misc/capiisdnmon | |
| parent | Add ruby20. Backport test fixes. (diff) | |
| download | gentoo-2-77fab5a6721ad1583340b71199aae4698d44e0e4.tar.gz gentoo-2-77fab5a6721ad1583340b71199aae4698d44e0e4.tar.bz2 gentoo-2-77fab5a6721ad1583340b71199aae4698d44e0e4.zip | |
Revision bump: fix linking, wrt bugs #370101 and #540672. Drop old revision with deprecated EAPI, wrt bug #540814
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)
Diffstat (limited to 'net-misc/capiisdnmon')
| -rw-r--r-- | net-misc/capiisdnmon/ChangeLog | 11 | ||||
| -rw-r--r-- | net-misc/capiisdnmon/capiisdnmon-0.42-r2.ebuild (renamed from net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild) | 34 |
2 files changed, 28 insertions, 17 deletions
diff --git a/net-misc/capiisdnmon/ChangeLog b/net-misc/capiisdnmon/ChangeLog index 9af61bb53b97..0ffd05c9a295 100644 --- a/net-misc/capiisdnmon/ChangeLog +++ b/net-misc/capiisdnmon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/capiisdnmon -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/capiisdnmon/ChangeLog,v 1.10 2011/03/29 11:59:19 angelos Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/capiisdnmon/ChangeLog,v 1.11 2015/03/05 07:49:33 pinkbyte Exp $ + +*capiisdnmon-0.42-r2 (05 Mar 2015) + + 05 Mar 2015; Sergey Popov <pinkbyte@gentoo.org> -capiisdnmon-0.42-r1.ebuild, + +capiisdnmon-0.42-r2.ebuild: + Revision bump: fix linking, wrt bugs #370101 and #540672. Drop old revision + with deprecated EAPI, wrt bug #540814 29 Mar 2011; Christoph Mende <angelos@gentoo.org> capiisdnmon-0.42-r1.ebuild: Fixed slot deps diff --git a/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild b/net-misc/capiisdnmon/capiisdnmon-0.42-r2.ebuild index 8d66d6c7a924..13cab321645c 100644 --- a/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild +++ b/net-misc/capiisdnmon/capiisdnmon-0.42-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild,v 1.6 2011/03/29 11:59:19 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/capiisdnmon/capiisdnmon-0.42-r2.ebuild,v 1.1 2015/03/05 07:49:33 pinkbyte Exp $ + +EAPI=5 -EAPI=1 inherit eutils flag-o-matic DESCRIPTION="a CAPI 2.0 ISDN call monitor with LDAP name resolution" @@ -12,30 +13,33 @@ SRC_URI="mirror://sourceforge/capiisdnmon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" RDEPEND="net-dialup/capi4k-utils net-nds/openldap + x11-libs/gtk+:2 + x11-libs/libX11 x11-libs/xosd - x11-libs/gtk+:2" +" DEPEND="${RDEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gcc44.patch +src_prepare() { + epatch \ + "${FILESDIR}/${P}-gcc44.patch" \ + "${FILESDIR}/${P}-capiv3.patch" + + append-cppflags -DLDAP_DEPRECATED - # apply CAPI V3 patch conditionally - grep 2>/dev/null -q CAPI_LIBRARY_V2 /usr/include/capiutils.h \ - && epatch "${FILESDIR}"/${P}-capiv3.patch + sed -i -e 's/capiIsdnMon:://' capiisdnmon.h || die - append-flags -DLDAP_DEPRECATED + # Fix linking, bugs #370101 and #540672 + append-libs -lX11 -llber + append-ldflags -pthread - sed -i s/capiIsdnMon::// capiisdnmon.h + epatch_user } src_install() { - make DESTDIR="${D}" install || die "make install failed" + default newicon icon1.xpm capiisdnmon.xpm make_desktop_entry capiIsdnMon "CAPI ISDN Monitor" capiisdnmon |