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