| 1 |
eva 13/03/30 21:27:48 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: meld-1.7.1.ebuild |
| 5 |
Log: |
| 6 |
Version bump. Switch to python-single-r1. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key C6085806) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.162 dev-util/meld/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.162&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.162&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?r1=1.161&r2=1.162 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v |
| 20 |
retrieving revision 1.161 |
| 21 |
retrieving revision 1.162 |
| 22 |
diff -u -r1.161 -r1.162 |
| 23 |
--- ChangeLog 29 Mar 2013 13:32:00 -0000 1.161 |
| 24 |
+++ ChangeLog 30 Mar 2013 21:27:48 -0000 1.162 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for dev-util/meld |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.161 2013/03/29 13:32:00 ago Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.162 2013/03/30 21:27:48 eva Exp $ |
| 30 |
+ |
| 31 |
+*meld-1.7.1 (30 Mar 2013) |
| 32 |
+ |
| 33 |
+ 30 Mar 2013; Gilles Dartiguelongue <eva@g.o> +meld-1.7.1.ebuild: |
| 34 |
+ Version bump. Switch to python-single-r1. |
| 35 |
|
| 36 |
29 Mar 2013; Agostino Sarubbo <ago@g.o> meld-1.7.0.ebuild: |
| 37 |
Stable for ia64, wrt bug #458984 |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 dev-util/meld/meld-1.7.1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: meld-1.7.1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2013 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.7.1.ebuild,v 1.1 2013/03/30 21:27:48 eva Exp $ |
| 51 |
|
| 52 |
EAPI="5" |
| 53 |
GCONF_DEBUG="no" |
| 54 |
PYTHON_COMPAT=( python2_{6,7} ) |
| 55 |
|
| 56 |
inherit eutils python-single-r1 gnome2 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="+highlight gnome" |
| 65 |
|
| 66 |
# FIXME: switch pygtksourceview and gconf-python to python-r1 |
| 67 |
RDEPEND=" |
| 68 |
${PYTHON_DEPS} |
| 69 |
>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}] |
| 70 |
>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}] |
| 71 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
| 72 |
dev-python/pycairo[${PYTHON_USEDEP}] |
| 73 |
highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] ) |
| 74 |
gnome? ( >=dev-python/gconf-python-2.22:2 ) |
| 75 |
" |
| 76 |
DEPEND="${RDEPEND} |
| 77 |
dev-util/gtk-doc-am |
| 78 |
dev-util/intltool |
| 79 |
app-text/scrollkeeper |
| 80 |
" |
| 81 |
|
| 82 |
src_prepare() { |
| 83 |
# fix the prefix so its not in */local/* |
| 84 |
sed -e "s:/usr/local:${EPREFIX}/usr:" \ |
| 85 |
-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \ |
| 86 |
-i INSTALL || die "sed 1 failed" |
| 87 |
|
| 88 |
# don't install anything to /usr/share/doc/meld |
| 89 |
sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \ |
| 90 |
-i INSTALL || die "sed 2 failed" |
| 91 |
|
| 92 |
# don't run scrollkeeper (with the wrong path), |
| 93 |
# leave that to gnome2.eclass #145833 |
| 94 |
sed -e '/scrollkeeper-update/s/\t/&#/' \ |
| 95 |
-i help/*/Makefile || die "sed 4 failed" |
| 96 |
|
| 97 |
# don't run update-*-database, leave that to eclass |
| 98 |
sed -e '/update-.*-database/d' \ |
| 99 |
-i Makefile || die "sed 5 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 |
# Fix .desktop entry, upstream bug #686978 |
| 113 |
sed -e '/Encoding/d' \ |
| 114 |
-e 's/(MimeType.*)/\1/' \ |
| 115 |
-i data/meld.desktop.in || die |
| 116 |
|
| 117 |
gnome2_src_prepare |
| 118 |
} |
| 119 |
|
| 120 |
src_configure() { |
| 121 |
: |
| 122 |
} |
| 123 |
|
| 124 |
src_install() { |
| 125 |
DOCS="NEWS" |
| 126 |
gnome2_src_install |
| 127 |
python_fix_shebang "${ED}"/usr/bin |
| 128 |
doman meld.1 |
| 129 |
} |
Archives