1 |
bicatali 14/04/30 15:48:03 |
2 |
|
3 |
Modified: pacparser-1.3.1.ebuild ChangeLog |
4 |
Log: |
5 |
Removed conflict, bug #509168 |
6 |
|
7 |
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-libs/pacparser/pacparser-1.3.1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: pacparser-1.3.1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- pacparser-1.3.1.ebuild 26 Nov 2013 05:29:31 -0000 1.1 |
23 |
+++ pacparser-1.3.1.ebuild 30 Apr 2014 15:48:03 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
-# Copyright 1999-2013 Gentoo Foundation |
26 |
+# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild,v 1.1 2013/11/26 05:29:31 bicatali Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/pacparser-1.3.1.ebuild,v 1.2 2014/04/30 15:48:03 bicatali Exp $ |
30 |
|
31 |
EAPI=5 |
32 |
|
33 |
@@ -14,7 +14,7 @@ |
34 |
|
35 |
LICENSE="LGPL-3" |
36 |
SLOT="0" |
37 |
-KEYWORDS="~amd64 ~x86" |
38 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
39 |
IUSE="doc python" |
40 |
|
41 |
DEPEND="python? ( ${PYTHON_DEPS} )" |
42 |
@@ -41,11 +41,13 @@ |
43 |
} |
44 |
|
45 |
src_install() { |
46 |
- emake DESTDIR="${D}" LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install |
47 |
+ emake DESTDIR="${ED}" LIB_PREFIX="${ED}/usr/$(get_libdir)" -C src install |
48 |
dodoc README |
49 |
use python && python_foreach_impl \ |
50 |
emake DESTDIR="${D}" \ |
51 |
LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install-pymod |
52 |
- use doc && emake DESTDIR="${D}" \ |
53 |
- DOC_PREFIX="${D}/usr/share/doc/${PF}" -C src install-docs |
54 |
+ use doc && emake DESTDIR="${ED}" \ |
55 |
+ DOC_PREFIX="${ED}/usr/share/doc/${PF}" -C src install-docs |
56 |
+ # conflicts (bug #509168), and useless |
57 |
+ rm "${ED}"/usr/share/man/man3/deprecated.3 || die |
58 |
} |
59 |
|
60 |
|
61 |
|
62 |
1.2 net-libs/pacparser/ChangeLog |
63 |
|
64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/ChangeLog?rev=1.2&view=markup |
65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/ChangeLog?rev=1.2&content-type=text/plain |
66 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pacparser/ChangeLog?r1=1.1&r2=1.2 |
67 |
|
68 |
Index: ChangeLog |
69 |
=================================================================== |
70 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/pacparser/ChangeLog,v |
71 |
retrieving revision 1.1 |
72 |
retrieving revision 1.2 |
73 |
diff -u -r1.1 -r1.2 |
74 |
--- ChangeLog 26 Nov 2013 05:29:31 -0000 1.1 |
75 |
+++ ChangeLog 30 Apr 2014 15:48:03 -0000 1.2 |
76 |
@@ -1,6 +1,9 @@ |
77 |
# ChangeLog for net-libs/pacparser |
78 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
79 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/ChangeLog,v 1.1 2013/11/26 05:29:31 bicatali Exp $ |
80 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
81 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pacparser/ChangeLog,v 1.2 2014/04/30 15:48:03 bicatali Exp $ |
82 |
+ |
83 |
+ 30 Apr 2014; Sébastien Fabbro <bicatali@g.o> pacparser-1.3.1.ebuild: |
84 |
+ Removed conflict, bug #509168 |
85 |
|
86 |
*pacparser-1.3.1 (26 Nov 2013) |