1 |
johu 14/03/20 22:08:32 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kdiff3-0.9.97-r2.ebuild |
5 |
Log: |
6 |
Revision bump to EAPI 5. |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
9 |
|
10 |
Revision Changes Path |
11 |
1.70 kde-misc/kdiff3/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.70&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.70&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.69&r2=1.70 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v |
20 |
retrieving revision 1.69 |
21 |
retrieving revision 1.70 |
22 |
diff -u -r1.69 -r1.70 |
23 |
--- ChangeLog 2 Mar 2013 21:29:51 -0000 1.69 |
24 |
+++ ChangeLog 20 Mar 2014 22:08:32 -0000 1.70 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for kde-misc/kdiff3 |
27 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.69 2013/03/02 21:29:51 hwoarang Exp $ |
29 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.70 2014/03/20 22:08:32 johu Exp $ |
31 |
+ |
32 |
+*kdiff3-0.9.97-r2 (20 Mar 2014) |
33 |
+ |
34 |
+ 20 Mar 2014; Johannes Huber <johu@g.o> +kdiff3-0.9.97-r2.ebuild: |
35 |
+ Revision bump to EAPI 5. |
36 |
|
37 |
02 Mar 2013; Markos Chandras <hwoarang@g.o> kdiff3-0.9.97-r1.ebuild: |
38 |
Move Qt dependencies to the new category |
39 |
|
40 |
|
41 |
|
42 |
1.1 kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: kdiff3-0.9.97-r2.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2014 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.1 2014/03/20 22:08:31 johu Exp $ |
52 |
|
53 |
EAPI=5 |
54 |
|
55 |
if [[ ${PV} != *9999* ]]; then |
56 |
KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga |
57 |
gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk |
58 |
sv ta tg tr ug uk zh_CN zh_TW" |
59 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
60 |
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" |
61 |
KDE_HANDBOOK="optional" |
62 |
else |
63 |
ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3" |
64 |
KEYWORDS="" |
65 |
fi |
66 |
|
67 |
KDE_REQUIRED="optional" |
68 |
inherit kde4-base qt4-r2 |
69 |
|
70 |
DESCRIPTION="Qt/KDE based frontend to diff3" |
71 |
HOMEPAGE="http://kdiff3.sourceforge.net/" |
72 |
|
73 |
LICENSE="GPL-2" |
74 |
SLOT="4" |
75 |
IUSE="debug kde" |
76 |
|
77 |
DEPEND=" |
78 |
dev-qt/qtcore:4 |
79 |
dev-qt/qtgui:4 |
80 |
kde? ( $(add_kdebase_dep kdelibs) ) |
81 |
" |
82 |
RDEPEND="${DEPEND} |
83 |
sys-apps/diffutils |
84 |
" |
85 |
|
86 |
PATCHES=( |
87 |
"${FILESDIR}/${PN}-0.9.97-relativepath.patch" |
88 |
) |
89 |
|
90 |
RESTRICT="!kde? ( test )" |
91 |
|
92 |
src_unpack(){ |
93 |
if [[ ${PV} == *9999* ]]; then |
94 |
subversion_src_unpack |
95 |
elif use kde; then |
96 |
kde4-base_src_unpack |
97 |
else |
98 |
qt4-r2_src_unpack |
99 |
fi |
100 |
} |
101 |
|
102 |
src_prepare() { |
103 |
if ! use kde; then |
104 |
# adapt to Gentoo paths |
105 |
sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \ |
106 |
-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \ |
107 |
"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro |
108 |
else |
109 |
kde4-base_src_prepare |
110 |
fi |
111 |
} |
112 |
|
113 |
src_configure() { |
114 |
if use kde; then |
115 |
kde4-base_src_configure |
116 |
else |
117 |
eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro |
118 |
fi |
119 |
} |
120 |
|
121 |
src_compile() { |
122 |
if use kde; then |
123 |
kde4-base_src_compile |
124 |
else |
125 |
qt4-r2_src_compile |
126 |
fi |
127 |
} |
128 |
|
129 |
src_install() { |
130 |
if use kde; then |
131 |
kde4-base_src_install |
132 |
else |
133 |
qt4-r2_src_install |
134 |
fi |
135 |
} |
136 |
|
137 |
src_test() { |
138 |
if use kde; then |
139 |
kde4-base_src_test |
140 |
fi |
141 |
} |