fix python eclass use, bug #207667

fix some potential eautoreconf problems
Package-Manager: portage-2.1.4.4

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index df44245fea9c68209a4f8cc626320dcad6ac1cdb..32e3c2e3de6f9472698cb2b9259782dd99f3b157 100644 (file)
--- a/gnome-extra/at-spi/ChangeLog
+++ b/gnome-extra/at-spi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/at-spi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.162 2007/11/29 05:12:27 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.163 2008/02/18 11:48:57 eva Exp $
+
+  18 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/at-spi-1.20.1-drop-gtk-doc.patch, at-spi-1.20.1.ebuild:
+  fix python eclass use, bug #207667
+  fix potential autoregen problems
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> at-spi-1.20.1.ebuild:
   Stable for HPPA (bug #199740).

diff --git a/gnome-extra/at-spi/Manifest b/gnome-extra/at-spi/Manifest
index cb6e6c89d6d46e1f22796fc30ed8780f94e316c7..9f5fa25b2adf0f45da538b0da777e9fbf1d9840e 100644 (file)
--- a/gnome-extra/at-spi/Manifest
+++ b/gnome-extra/at-spi/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX at-spi-1.18.0-ior-leak.patch 912 RMD160 73083d6f327f7e4da72f55333c4beab36e0ade34 SHA1 1a995a4690b0469fc286c06cdf9e10b9e24b9191 SHA256 0b0516e2a74b1946c067c6d9e09f24696ad4101550493ea56ebe20944176fa87
 AUX at-spi-1.18.1-focus-tracker-leak.patch 462 RMD160 34ce0f1550910826b1c731f83333b1abc10f2a1b SHA1 2e71d480e5e935520e04b1057627438936e86310 SHA256 b5ff55809300956236ebc4432b64763882ab13c8660b5406c2b71ee14f53771c
 AUX at-spi-1.18.1-tests.patch 3496 RMD160 67cae7cc0e8fa13f937d53ed5a5f5ceab50f7947 SHA1 16f4ce391a5131e30731cf2a41d84e3bfe1626be SHA256 60a7db7845ab7fb2651b327f10b8a3e5844821f1a9e7bf73090650c8f7de1b13
 AUX at-spi-1.19.3-tests.patch 3541 RMD160 649f6381d4cef0dcd5ad00d76d935acaa91d7532 SHA1 2cdd95e89a9115d990b59c02ce0863b41c94332e SHA256 23ed4f7026969eba5df992cb7290740c8eb62fa701cdf50f9f06eec83b559f3d
+AUX at-spi-1.20.1-drop-gtk-doc.patch 909 RMD160 3467ca3549d316cc122604be735e51e7625f905f SHA1 a362ebd15190a847c043f9f875389fe96f4aa693 SHA256 963280f5a15c7477339eda46c5809343abb34aad031874f33cee1f3e9c422181
 AUX at-spi-1.7.12-tests.patch 3269 RMD160 351e5af3c656ad19609541ec9393ed3394599de0 SHA1 83288df820420517eae25cc2c9854f0dac25cb81 SHA256 5f2f861395576a07ddac1fed5b975620a887f16bb6266407a9ac6f4870bceb38
 DIST at-spi-1.18.1.tar.bz2 780306 RMD160 c5e60314414124388d025dc85effb5d9adf5d2b9 SHA1 d8b96202c754636fb47499cd6b80c2ca23960e3b SHA256 3b0be3207eb5cf4b1c1666b1dcd341ac914802b5404defb812e3b2aa9e78e7aa
 DIST at-spi-1.20.1.tar.bz2 842254 RMD160 b5ea35bbda69de460ec1b846a462a083eff9f9fe SHA1 5ad1ecf8c299dcfc82ec4cf3db4c6fd5874676bc SHA256 d592833339a347d6e4b33946b717b7bbe61f7730d714112cd99715c5a3a3714e
 DIST at-spi-1.7.12.tar.bz2 787767 RMD160 d204397965312b1af34dc7dc64d1f34c9cdb69ee SHA1 f22ced98e94dece6d1634dbed06f674aa9f1fdb6 SHA256 e4527b98874526b9ff8300f84879a154884ae9d8278d0ab6f926ab03209613e4
 EBUILD at-spi-1.18.1-r1.ebuild 1242 RMD160 a1eefa1eaf07e4e35c754885a81512fe71d0859c SHA1 28cbe971ccf9d1d2a2c3fd37843903d7027a1169 SHA256 d7ac93f855a2bbf532ab077c7c19e2125117ab4beb36e70c93815b779bc61e0e
-EBUILD at-spi-1.20.1.ebuild 1146 RMD160 98d0a45b59b0883364872224fdcd91a59e237042 SHA1 8b22d25056c9bd522b56940e0670c2629b63f9b8 SHA256 a0cd76b07e5f63874b9bc00f23d8412ddca2f15927b13eebcfc5e8c5b1d06433
+EBUILD at-spi-1.20.1.ebuild 1645 RMD160 bf1f642830f280eeda6ea3a2a407bb6997b9fcd1 SHA1 85efa91bfe0a494df24d6ab040297b42bbc3aa6d SHA256 ae7a0d387f7bcfede82e1870f124c8b798bff3d17877b228a42146397f3406c7
 EBUILD at-spi-1.7.12.ebuild 1121 RMD160 dcbcb07b2b44f69fb583f34a60a0f4fc0226c72d SHA1 116110d7c2ec49910a744558ed71b996e6e20239 SHA256 18e24150e9570000ba5e7f33341277d12e72a002a73eeefac130addd86138238
-MISC ChangeLog 18547 RMD160 926c07ef2a86aa878cc0ba91153ac620eed53dbc SHA1 853458a6dc797596f153dcc4470d13c474180493 SHA256 c5d69e0b4fb5455f3695fdf2b7efb2fcaf86f9f70e6a430aadb9952b45fd58b6
+MISC ChangeLog 18739 RMD160 15929401be07031411b11d80e614185d38ae3e4e SHA1 db08f9cfef2bda6221191618434ef21c3185c3d3 SHA256 bd9875795b44be454c014ea756cc42b6344d37576c635e38c0f74836150025f9
 MISC metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 SHA1 2a33de77ba2f0f4fdedeed148abdad125b78f996 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHuXC41fmVwcYIWAYRAi2UAKCwY/OHre8UPhcQOYYilg6B7WvyzACgqPjg
+qK/CN26HJalepQo9KmwyEBA=
+=sPFa
+-----END PGP SIGNATURE-----

diff --git a/gnome-extra/at-spi/at-spi-1.20.1.ebuild b/gnome-extra/at-spi/at-spi-1.20.1.ebuild
index ab1063a6db628bf1a60bd492aeae42cfdf3f7e83..5d8753c85a0358d9dc54c6877299d2fc0e91047d 100644 (file)
--- a/gnome-extra/at-spi/at-spi-1.20.1.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.20.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.20.1.ebuild,v 1.7 2007/11/29 05:12:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.20.1.ebuild,v 1.8 2008/02/18 11:48:57 eva Exp $
 
 WANT_AUTOMAKE="1.9"
 
-inherit virtualx autotools eutils gnome2
+inherit virtualx autotools eutils gnome2 python
 
 DESCRIPTION="The Gnome Accessibility Toolkit"
 HOMEPAGE="http://developer.gnome.org/projects/gap/"
@@ -14,12 +14,15 @@ SLOT="1"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc"
 
+#next bump: check if we should activate Xevie or not
+
 RDEPEND=">=dev-libs/atk-1.17
        >=x11-libs/gtk+-2.10.0
        >=gnome-base/gail-1.9.0
        >=gnome-base/libbonobo-1.107
        >=gnome-base/orbit-2
        dev-libs/popt
+       >=dev-lang/python-2.4
 
        x11-libs/libICE
        x11-libs/libSM
@@ -42,13 +45,31 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 src_unpack() {
        gnome2_src_unpack
 
-       #
+       # bug number ?
        epatch "${FILESDIR}"/${PN}-1.19.3-tests.patch
 
-       cp aclocal.m4 old_macros.m4
-       AT_M4DIR="." eautoreconf
+       # disable pyc compiling
+       mv py-compile py-compile.orig
+       ln -s $(type -P true) py-compile
+
+       # drop gtk-doc for autoreconf
+       use doc || epatch "${FILESDIR}/${P}-drop-gtk-doc.patch"
+
+       eautoreconf
 }
 
 src_test() {
-       Xmake check || die "Testing phase failed"
+       Xemake check || die "Testing phase failed"
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+       python_version
+       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+       python_version
+       python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
 }

diff --git a/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch b/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch
new file mode 100644 (file)
index 0000000..a0f5007
--- /dev/null
+++ b/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch
@@ -0,0 +1,29 @@
+--- configure.in.old   2008-02-18 12:12:11.000000000 +0100
++++ configure.in       2008-02-18 12:13:02.000000000 +0100
+@@ -66,8 +66,14 @@
+ localedir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(localedir)
+ 
++dnl Crazy hack for dropping the dep on gtk-doc
++AC_DEFUN(GTK_DOC_CHECK, [])
+ GTK_DOC_CHECK([1.0])
+ 
++dnl Crazy hack for dropping the dep on gtk-doc
++AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
++AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
++
+ AC_PATH_XTRA
+ 
+ if test x$no_x = xyes ; then
+--- Makefile.am.old    2008-02-18 12:13:08.000000000 +0100
++++ Makefile.am        2008-02-18 12:13:59.000000000 +0100
+@@ -1,4 +1,8 @@
+-SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi pyatspi test po
++SUBDIRS = idl libspi login-helper registryd atk-bridge cspi pyatspi test po
++
++if ENABLE_GTK_DOC
++SUBDIRS += docs
++endif
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc