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