1 |
pacho 12/04/02 22:06:51 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: meld-1.5.4.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.1.10.54/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.138 dev-util/meld/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.138&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.138&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?r1=1.137&r2=1.138 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v |
20 |
retrieving revision 1.137 |
21 |
retrieving revision 1.138 |
22 |
diff -u -r1.137 -r1.138 |
23 |
--- ChangeLog 29 Jan 2012 10:54:23 -0000 1.137 |
24 |
+++ ChangeLog 2 Apr 2012 22:06:51 -0000 1.138 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for dev-util/meld |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.137 2012/01/29 10:54:23 pacho Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.138 2012/04/02 22:06:51 pacho Exp $ |
30 |
+ |
31 |
+*meld-1.5.4 (02 Apr 2012) |
32 |
+ |
33 |
+ 02 Apr 2012; Pacho Ramos <pacho@g.o> +meld-1.5.4.ebuild: |
34 |
+ Version bump. |
35 |
|
36 |
*meld-1.5.3 (29 Jan 2012) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-util/meld/meld-1.5.4.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.5.4.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.5.4.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: meld-1.5.4.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2012 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.5.4.ebuild,v 1.1 2012/04/02 22:06:51 pacho Exp $ |
51 |
|
52 |
EAPI="4" |
53 |
GCONF_DEBUG="no" |
54 |
PYTHON_DEPEND="2:2.5" |
55 |
|
56 |
inherit python gnome2 eutils multilib |
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="doc gnome" |
65 |
|
66 |
RDEPEND=" |
67 |
>=dev-python/pygtk-2.14:2 |
68 |
>=dev-python/pygobject-2.8:2 |
69 |
gnome? ( >=dev-python/gconf-python-2.22:2 ) |
70 |
" |
71 |
DEPEND="${RDEPEND} |
72 |
dev-util/intltool |
73 |
app-text/scrollkeeper" |
74 |
|
75 |
pkg_setup() { |
76 |
DOCS="NEWS" |
77 |
# Needed for optimizing python modules against proper interpreter |
78 |
python_set_active_version 2 |
79 |
python_pkg_setup |
80 |
} |
81 |
|
82 |
src_prepare() { |
83 |
gnome2_src_prepare |
84 |
|
85 |
# fix the prefix so its not in */local/* |
86 |
sed -e "s:/usr/local:${EPREFIX}/usr:" \ |
87 |
-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \ |
88 |
-i INSTALL || die "sed 1 failed" |
89 |
|
90 |
# don't install anything to /usr/share/doc/meld |
91 |
sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \ |
92 |
-i INSTALL || die "sed 2 failed" |
93 |
|
94 |
# let the python eclass handle python objects |
95 |
sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \ |
96 |
-i Makefile || die "sed 3 failed" |
97 |
|
98 |
# don't run scrollkeeper (with the wrong path), |
99 |
# leave that to gnome2.eclass #145833 |
100 |
sed -e '/scrollkeeper-update/s/\t/&#/' \ |
101 |
-i help/*/Makefile || die "sed 4 failed" |
102 |
|
103 |
# replace all calls to python by specific major version |
104 |
sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \ |
105 |
-i INSTALL || die "sed 6 failed" |
106 |
python_convert_shebangs 2 "${S}"/tools/* |
107 |
|
108 |
strip-linguas -i "${S}/po" |
109 |
local mylinguas="" |
110 |
for x in ${LINGUAS}; do |
111 |
mylinguas="${mylinguas} ${x}.po" |
112 |
done |
113 |
|
114 |
if [ -n "${mylinguas}" ]; then |
115 |
sed -e "s/PO:=.*/PO:=${mylinguas}/" \ |
116 |
-i po/Makefile || die "sed 5 failed" |
117 |
fi |
118 |
} |
119 |
|
120 |
src_configure() { |
121 |
: |
122 |
} |
123 |
|
124 |
src_install() { |
125 |
gnome2_src_install |
126 |
python_convert_shebangs 2 "${ED}"usr/bin/meld |
127 |
} |
128 |
|
129 |
pkg_postinst() { |
130 |
gnome2_pkg_postinst |
131 |
python_mod_optimize /usr/$(get_libdir)/meld |
132 |
} |
133 |
|
134 |
pkg_postrm() { |
135 |
gnome2_pkg_postrm |
136 |
python_mod_cleanup /usr/$(get_libdir)/meld |
137 |
} |