Gentoo Archives: gentoo-commits

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