diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-04-30 15:48:03 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-04-30 15:48:03 +0000 |
| commit | 636ecfa06152f56697870a13091efb643516c624 (patch) | |
| tree | d94f6c1d9a279730d2d5adb9ef4c560e8d5c7bae /net-libs/pacparser | |
| parent | Fix up dodoc line; reported in bug #498874 by James Cloos, patch provided by ... (diff) | |
| download | gentoo-2-636ecfa06152f56697870a13091efb643516c624.tar.gz gentoo-2-636ecfa06152f56697870a13091efb643516c624.tar.bz2 gentoo-2-636ecfa06152f56697870a13091efb643516c624.zip | |
Removed conflict, bug #509168
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'net-libs/pacparser')
| -rw-r--r-- | net-libs/pacparser/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/pacparser/pacparser-1.3.1.ebuild | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/net-libs/pacparser/ChangeLog b/net-libs/pacparser/ChangeLog index ff65d9097429..e1e66bb83341 100644 --- a/net-libs/pacparser/ChangeLog +++ b/net-libs/pacparser/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/pacparser -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/ChangeLog,v 1.1 2013/11/26 05:29:31 bicatali Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/ChangeLog,v 1.2 2014/04/30 15:48:03 bicatali Exp $ + + 30 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> pacparser-1.3.1.ebuild: + Removed conflict, bug #509168 *pacparser-1.3.1 (26 Nov 2013) diff --git a/net-libs/pacparser/pacparser-1.3.1.ebuild b/net-libs/pacparser/pacparser-1.3.1.ebuild index 4ee0d0c51a73..f4e40c6215b6 100644 --- a/net-libs/pacparser/pacparser-1.3.1.ebuild +++ b/net-libs/pacparser/pacparser-1.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild,v 1.1 2013/11/26 05:29:31 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild,v 1.2 2014/04/30 15:48:03 bicatali Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc python" DEPEND="python? ( ${PYTHON_DEPS} )" @@ -41,11 +41,13 @@ src_test() { } src_install() { - emake DESTDIR="${D}" LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install + emake DESTDIR="${ED}" LIB_PREFIX="${ED}/usr/$(get_libdir)" -C src install dodoc README use python && python_foreach_impl \ emake DESTDIR="${D}" \ LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install-pymod - use doc && emake DESTDIR="${D}" \ - DOC_PREFIX="${D}/usr/share/doc/${PF}" -C src install-docs + use doc && emake DESTDIR="${ED}" \ + DOC_PREFIX="${ED}/usr/share/doc/${PF}" -C src install-docs + # conflicts (bug #509168), and useless + rm "${ED}"/usr/share/man/man3/deprecated.3 || die } |