1 |
pacho 14/05/31 10:37:44 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: meld-1.8.5.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.181 dev-util/meld/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.181&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.181&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?r1=1.180&r2=1.181 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v |
20 |
retrieving revision 1.180 |
21 |
retrieving revision 1.181 |
22 |
diff -u -r1.180 -r1.181 |
23 |
--- ChangeLog 26 Apr 2014 07:32:15 -0000 1.180 |
24 |
+++ ChangeLog 31 May 2014 10:37:44 -0000 1.181 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for dev-util/meld |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.180 2014/04/26 07:32:15 pacho Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.181 2014/05/31 10:37:44 pacho Exp $ |
30 |
+ |
31 |
+*meld-1.8.5 (31 May 2014) |
32 |
+ |
33 |
+ 31 May 2014; Pacho Ramos <pacho@g.o> +meld-1.8.5.ebuild: |
34 |
+ Version bump |
35 |
|
36 |
26 Apr 2014; Pacho Ramos <pacho@g.o> -meld-1.7.0.ebuild, |
37 |
-meld-1.8.1.ebuild, -meld-1.8.2.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-util/meld/meld-1.8.5.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.8.5.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.8.5.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: meld-1.8.5.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2014 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.5.ebuild,v 1.1 2014/05/31 10:37:44 pacho Exp $ |
51 |
|
52 |
EAPI="5" |
53 |
GCONF_DEBUG="no" |
54 |
PYTHON_COMPAT=( python2_{6,7} ) |
55 |
|
56 |
inherit eutils python-single-r1 gnome2 |
57 |
|
58 |
DESCRIPTION="A graphical diff and merge tool" |
59 |
HOMEPAGE="http://meldmerge.org/" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
64 |
IUSE="+highlight gnome" |
65 |
|
66 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
67 |
|
68 |
RDEPEND=" |
69 |
${PYTHON_DEPS} |
70 |
>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}] |
71 |
>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}] |
72 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
73 |
dev-python/pycairo[${PYTHON_USEDEP}] |
74 |
highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] ) |
75 |
gnome? ( >=dev-python/gconf-python-2.22:2[${PYTHON_USEDEP}] ) |
76 |
" |
77 |
DEPEND="${RDEPEND} |
78 |
app-text/scrollkeeper |
79 |
dev-util/gtk-doc-am |
80 |
dev-util/intltool |
81 |
" |
82 |
|
83 |
src_prepare() { |
84 |
# fix the prefix so its not in */local/* |
85 |
sed -e "s:/usr/local:${EPREFIX}/usr:" \ |
86 |
-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \ |
87 |
-i INSTALL || die "sed 1 failed" |
88 |
|
89 |
# don't install anything to /usr/share/doc/meld |
90 |
sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \ |
91 |
-i INSTALL || die "sed 2 failed" |
92 |
|
93 |
# don't run scrollkeeper (with the wrong path), |
94 |
# leave that to gnome2.eclass #145833 |
95 |
sed -e '/scrollkeeper-update/s/\t/&#/' \ |
96 |
-i help/*/Makefile || die "sed 4 failed" |
97 |
|
98 |
strip-linguas -i "${S}/po" |
99 |
local mylinguas="" |
100 |
for x in ${LINGUAS}; do |
101 |
mylinguas="${mylinguas} ${x}.po" |
102 |
done |
103 |
|
104 |
if [ -n "${mylinguas}" ]; then |
105 |
sed -e "s/PO:=.*/PO:=${mylinguas}/" \ |
106 |
-i po/Makefile || die "sed 6 failed" |
107 |
fi |
108 |
|
109 |
gnome2_src_prepare |
110 |
} |
111 |
|
112 |
src_configure() { |
113 |
: |
114 |
} |
115 |
|
116 |
src_install() { |
117 |
gnome2_src_install |
118 |
python_fix_shebang "${ED}"/usr/bin |
119 |
doman meld.1 |
120 |
} |