| 1 |
pacho 11/01/26 14:47:50 |
| 2 |
|
| 3 |
Modified: ChangeLog dia-0.97.1.ebuild |
| 4 |
Log: |
| 5 |
Let it compile when python3 is main interpreter. Bump to eapi3. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.130 app-office/dia/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/ChangeLog?rev=1.130&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/ChangeLog?rev=1.130&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/ChangeLog?r1=1.129&r2=1.130 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v |
| 19 |
retrieving revision 1.129 |
| 20 |
retrieving revision 1.130 |
| 21 |
diff -u -r1.129 -r1.130 |
| 22 |
--- ChangeLog 9 Sep 2010 16:50:19 -0000 1.129 |
| 23 |
+++ ChangeLog 26 Jan 2011 14:47:50 -0000 1.130 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for app-office/dia |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.129 2010/09/09 16:50:19 pacho Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.130 2011/01/26 14:47:50 pacho Exp $ |
| 30 |
+ |
| 31 |
+ 26 Jan 2011; Pacho Ramos <pacho@g.o> dia-0.97.1.ebuild: |
| 32 |
+ Let it compile when python3 is main interpreter. Bump to eapi3. |
| 33 |
|
| 34 |
09 Sep 2010; Pacho Ramos <pacho@g.o> dia-0.97.1.ebuild: |
| 35 |
Don't use -DGTK_DISABLE_DEPRECATED (bug #333439) and RDEPEND on gtk+:2. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.11 app-office/dia/dia-0.97.1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/dia-0.97.1.ebuild?rev=1.11&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/dia-0.97.1.ebuild?rev=1.11&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/dia-0.97.1.ebuild?r1=1.10&r2=1.11 |
| 44 |
|
| 45 |
Index: dia-0.97.1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v |
| 48 |
retrieving revision 1.10 |
| 49 |
retrieving revision 1.11 |
| 50 |
diff -u -r1.10 -r1.11 |
| 51 |
--- dia-0.97.1.ebuild 9 Sep 2010 16:50:19 -0000 1.10 |
| 52 |
+++ dia-0.97.1.ebuild 26 Jan 2011 14:47:50 -0000 1.11 |
| 53 |
@@ -1,8 +1,10 @@ |
| 54 |
-# Copyright 1999-2010 Gentoo Foundation |
| 55 |
+# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.10 2010/09/09 16:50:19 pacho Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.11 2011/01/26 14:47:50 pacho Exp $ |
| 59 |
|
| 60 |
-EAPI="2" |
| 61 |
+EAPI="3" |
| 62 |
+GCONF_DEBUG="yes" |
| 63 |
+PYTHON_DEPEND="python? 2" |
| 64 |
|
| 65 |
inherit eutils gnome2 libtool autotools versionator python |
| 66 |
|
| 67 |
@@ -18,7 +20,6 @@ |
| 68 |
SLOT="0" |
| 69 |
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
| 70 |
# the doc USE flag doesn't seem to do anything without docbook2html |
| 71 |
-# FIXME: configure mixes debug and devel meaning (see -DGTK_DISABLE...) |
| 72 |
IUSE="cairo doc gnome png python zlib" |
| 73 |
|
| 74 |
RDEPEND=">=x11-libs/gtk+-2.6.0:2 |
| 75 |
@@ -36,9 +37,7 @@ |
| 76 |
>=gnome-base/libgnome-2.0 |
| 77 |
>=gnome-base/libgnomeui-2.0 ) |
| 78 |
cairo? ( >=x11-libs/cairo-1 ) |
| 79 |
- python? ( |
| 80 |
- >=dev-lang/python-1.5.2 |
| 81 |
- >=dev-python/pygtk-1.99 ) |
| 82 |
+ python? ( >=dev-python/pygtk-1.99 ) |
| 83 |
doc? ( |
| 84 |
~app-text/docbook-xml-dtd-4.5 |
| 85 |
app-text/docbook-xsl-stylesheets )" |
| 86 |
@@ -48,9 +47,8 @@ |
| 87 |
dev-util/pkgconfig |
| 88 |
doc? ( dev-libs/libxslt )" |
| 89 |
|
| 90 |
-DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO" |
| 91 |
- |
| 92 |
pkg_setup() { |
| 93 |
+ DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO" |
| 94 |
G2CONF="${G2CONF} |
| 95 |
$(use_with cairo) |
| 96 |
$(use_with python) |
| 97 |
@@ -61,6 +59,7 @@ |
| 98 |
--without-hardbooks |
| 99 |
--disable-static |
| 100 |
--docdir=/usr/share/doc/${PF}" |
| 101 |
+ use python && python_set_active_version 2 |
| 102 |
} |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
@@ -83,13 +82,15 @@ |
| 106 |
# Don't use -DGTK_DISABLE_DEPRECATED, bug #333439 |
| 107 |
sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' configure.in || die "sed 3 failed" |
| 108 |
|
| 109 |
+ use python && python_convert_shebangs -r 2 . |
| 110 |
+ |
| 111 |
intltoolize --force --copy --automake || die "intltoolize failed" |
| 112 |
eautoreconf |
| 113 |
} |
| 114 |
|
| 115 |
src_install() { |
| 116 |
gnome2_src_install |
| 117 |
- find "${D}" -name "*.la" -delete || die "failed to remove *.la" |
| 118 |
+ find "${ED}" -name "*.la" -delete || die "failed to remove *.la" |
| 119 |
} |
| 120 |
|
| 121 |
pkg_postinst() { |
| 122 |
@@ -102,5 +103,5 @@ |
| 123 |
|
| 124 |
pkg_postrm() { |
| 125 |
gnome2_pkg_postrm |
| 126 |
- python_mod_cleanup /usr/share/dia |
| 127 |
+ use python && python_mod_cleanup /usr/share/dia |
| 128 |
} |
Archives