| 1 |
pacho 10/12/31 18:29:35 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: meld-1.5.0.ebuild |
| 5 |
Log: |
| 6 |
Version bump, no longer uses gnome-vfs, requires at least python-2.5 and other fixes. |
| 7 |
|
| 8 |
(Portage version: 2.1.9.27/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.116 dev-util/meld/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.116&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.116&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?r1=1.115&r2=1.116 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v |
| 20 |
retrieving revision 1.115 |
| 21 |
retrieving revision 1.116 |
| 22 |
diff -u -r1.115 -r1.116 |
| 23 |
--- ChangeLog 23 Nov 2010 16:12:05 -0000 1.115 |
| 24 |
+++ ChangeLog 31 Dec 2010 18:29:35 -0000 1.116 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for dev-util/meld |
| 27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.115 2010/11/23 16:12:05 eva Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.116 2010/12/31 18:29:35 pacho Exp $ |
| 30 |
+ |
| 31 |
+*meld-1.5.0 (31 Dec 2010) |
| 32 |
+ |
| 33 |
+ 31 Dec 2010; Pacho Ramos <pacho@g.o> +meld-1.5.0.ebuild: |
| 34 |
+ Version bump, no longer uses gnome-vfs, requires at least python-2.5 and |
| 35 |
+ other fixes. |
| 36 |
|
| 37 |
23 Nov 2010; Gilles Dartiguelongue <eva@g.o> -meld-1.3.0.ebuild, |
| 38 |
-meld-1.3.2.ebuild, -meld-1.3.3.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 dev-util/meld/meld-1.5.0.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.5.0.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.5.0.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: meld-1.5.0.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2010 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.0.ebuild,v 1.1 2010/12/31 18:29:35 pacho Exp $ |
| 52 |
|
| 53 |
EAPI="3" |
| 54 |
GCONF_DEBUG="no" |
| 55 |
PYTHON_DEPEND="2:2.5" |
| 56 |
|
| 57 |
inherit python gnome2 eutils multilib |
| 58 |
|
| 59 |
DESCRIPTION="A graphical (GNOME 2) diff and merge tool" |
| 60 |
HOMEPAGE="http://meld.sourceforge.net/" |
| 61 |
|
| 62 |
LICENSE="GPL-2" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 65 |
IUSE="doc gnome" |
| 66 |
|
| 67 |
RDEPEND=" |
| 68 |
>=gnome-base/libglade-2 |
| 69 |
>=dev-python/pygtk-2.14 |
| 70 |
>=dev-python/pygobject-2.8 |
| 71 |
gnome? ( |
| 72 |
>=gnome-base/libgnome-2 |
| 73 |
>=dev-python/libgnome-python-2.22 |
| 74 |
>=dev-python/gconf-python-2.22 ) |
| 75 |
" |
| 76 |
DEPEND="${RDEPEND} |
| 77 |
dev-util/intltool |
| 78 |
app-text/scrollkeeper" |
| 79 |
|
| 80 |
pkg_setup() { |
| 81 |
DOCS="AUTHORS NEWS help/ChangeLog" |
| 82 |
# Needed for optimizing python modules against proper interpreter |
| 83 |
python_set_active_version 2 |
| 84 |
} |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
gnome2_src_prepare |
| 88 |
|
| 89 |
# fix the prefix so its not in */local/* |
| 90 |
sed -e "s:/usr/local:${EPREFIX}/usr:" \ |
| 91 |
-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \ |
| 92 |
-i INSTALL || die "sed 1 failed" |
| 93 |
|
| 94 |
# don't install anything to /usr/share/doc/meld |
| 95 |
sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \ |
| 96 |
-i INSTALL || die "sed 2 failed" |
| 97 |
|
| 98 |
# let the python eclass handle python objects |
| 99 |
sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \ |
| 100 |
-i Makefile || die "sed 3 failed" |
| 101 |
|
| 102 |
# don't run scrollkeeper (with the wrong path), |
| 103 |
# leave that to gnome2.eclass #145833 |
| 104 |
sed -e '/scrollkeeper-update/s/\t/&#/' \ |
| 105 |
-i help/*/Makefile || die "sed 4 failed" |
| 106 |
|
| 107 |
# fix test suite |
| 108 |
sed -e 's,\(for file in \["\)\(meld"\]\),\1bin/\2,' \ |
| 109 |
-e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \ |
| 110 |
-i tools/check_release || die "sed 5 failed" |
| 111 |
|
| 112 |
# replace all calls to python by specific major version |
| 113 |
sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \ |
| 114 |
-i INSTALL || die "sed 6 failed" |
| 115 |
python_convert_shebangs 2 "${S}"/tools/* |
| 116 |
|
| 117 |
strip-linguas -i "${S}/po" |
| 118 |
local mylinguas="" |
| 119 |
for x in ${LINGUAS}; do |
| 120 |
mylinguas="${mylinguas} ${x}.po" |
| 121 |
done |
| 122 |
|
| 123 |
if [ -n "${mylinguas}" ]; then |
| 124 |
sed -e "s/PO:=.*/PO:=${mylinguas}/" \ |
| 125 |
-i po/Makefile || die "sed 5 failed" |
| 126 |
fi |
| 127 |
} |
| 128 |
|
| 129 |
src_configure() { |
| 130 |
: |
| 131 |
} |
| 132 |
|
| 133 |
src_install() { |
| 134 |
gnome2_src_install |
| 135 |
python_convert_shebangs 2 "${ED}"usr/bin/meld |
| 136 |
} |
| 137 |
|
| 138 |
pkg_postinst() { |
| 139 |
gnome2_pkg_postinst |
| 140 |
python_mod_optimize /usr/$(get_libdir)/meld |
| 141 |
} |
| 142 |
|
| 143 |
pkg_postrm() { |
| 144 |
gnome2_pkg_postrm |
| 145 |
python_mod_cleanup /usr/$(get_libdir)/meld |
| 146 |
} |
Archives