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