Fix aclocal failure, bug #218917. Move to EAPI=2, move to split python bindings, bug #108479. Add missing pkgconfig to DEPEND. Use new python eclass functions in postinst.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 37 insertions, 134 deletions

diff --git a/media-video/istanbul/Manifest b/media-video/istanbul/Manifest
index 9554c5644f91..77807890c474 100644
--- a/media-video/istanbul/Manifest
+++ b/media-video/istanbul/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST istanbul-0.2.0.tar.bz2 319887 RMD160 cf9dcd1a921c44b641df3e86bfd6ed975880996d SHA1 689d0d995d832ec07d64c6b0334dacddf36f7e05 SHA256 eed28118b6581a9e77664e9079eb03f7be7f76b9a6e14e688243495473edd4c2
+AUX istanbul-0.2.2-macro-typo.patch 675 RMD160 e812e21827786ae44b6b8cf61a27738b87787922 SHA1 670b0fdcf44015bf53b57afe6046299da3d20a83 SHA256 e3adeadd35947be1f253f866a12abaab060a37ce5e6ddf8bf74a7c41c01e1455
 DIST istanbul-0.2.1.tar.bz2 326122 RMD160 36924ce5098cf1e0bf8168118a307138c68670f4 SHA1 45cf2c9f8e20113febe04223feb4b285a0f97c7c SHA256 50b70f859a835cada34e71576d0ff82dbe2cb7479275377e37812c47938e77fb
 DIST istanbul-0.2.2.tar.bz2 349075 RMD160 79ece5e4f2f9dd673fce5d326ad3b4009e54ccfe SHA1 f9649990429ef4fb083057685fec723c466ee4b0 SHA256 3baa2462ecf1b13d0d95cd035fe0f0fc0fcc3df8cb04a3b7f237e90e9a40acd5
-EBUILD istanbul-0.2.0-r1.ebuild 1516 RMD160 ba437f377b2e6cd46a8d2125748edbff2ed4b980 SHA1 8def7214e14bff3f9489830323100cddcfd51172 SHA256 8e33449bd9aa1e8ac68fb8dc55ccaa9743c0258e52441e8fd507f1896ced8b3f
-EBUILD istanbul-0.2.0.ebuild 955 RMD160 af4d90b4e3f081679d65eab4803a330cd3e6f5b8 SHA1 6c9251af70850c05f12fc62c489ff18252fda400 SHA256 68f46436abe473403e8356d327eac7a97012420fcf72460a1d01c69b5ae6d984
 EBUILD istanbul-0.2.1.ebuild 1513 RMD160 50d6fcde7b2c264d60fa03d10f2997254d03e041 SHA1 d1f04bc591de7112e065df4fe000aca9ebb4fe60 SHA256 a3db50b171ec4f4b7fbe1bcccf7412ac4bb577e436a44daa2e7f0042cb2546c8
-EBUILD istanbul-0.2.2.ebuild 1738 RMD160 7d599cbe47069ce0c94c8b23e15785d624c5c696 SHA1 d023afa95ff8586572afc5d37eaa2bb093ac9cae SHA256 fc2fc79ad7e9371408cc50bc06e5c6144c2ba5068fc6a27d67436f44b95d5712
+EBUILD istanbul-0.2.2.ebuild 1735 RMD160 a7784d3b26b90e337b34a518551f661a50a3267e SHA1 2169a33e57fbc68f118cf6f2100b1c4f6c04d6fc SHA256 928ead0c5d58718b2cef185508f89c23476e9ae9207262bd8296bfbb98dcf434
 MISC ChangeLog 1954 RMD160 bf387b022d5accc602144a217d42fdf89518d6b9 SHA1 6733d6b29a40810809b7c29cdbeeccad5037314e SHA256 4c1a794ba65e68d2a34c3125e022f6090b74e52adefac0f25a7c04938a9f766a
 MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkg+6EgACgkQQU4yORhF8iB+dQCfcbHNZ3uZuQBhajukgze2ycAw
-XbYAn1NQL0cUr1CAokd8z2v2r0ApGvBV
-=3Brs
+iEYEARECAAYFAkptdVsACgkQ1fmVwcYIWAY3wACgkERctcLO5epsAdO+Fu/BRagY
+NMIAoJ4kZ5FnWr4tY/+Rd94OxkVS7cr+
+=X0Hw
 -----END PGP SIGNATURE-----
diff --git a/media-video/istanbul/istanbul-0.2.0-r1.ebuild b/media-video/istanbul/istanbul-0.2.0-r1.ebuild
deleted file mode 100644
index 5165ae621831..000000000000
--- a/media-video/istanbul/istanbul-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/istanbul-0.2.0-r1.ebuild,v 1.8 2008/05/29 17:30:45 hawking Exp $
-
-inherit eutils gnome2 python autotools
-
-KEYWORDS="~x86 ~amd64"
-
-HOMEPAGE="http://live.gnome.org/Istanbul"
-LICENSE="GPL-2"
-SLOT=0
-DESCRIPTION="Istanbul is a screencast application for the Unix desktop"
-IUSE=""
-
-RDEPEND=">=media-libs/gst-plugins-base-0.10.8
-	dev-lang/python
-	>=dev-python/pygtk-2.6
-	>=dev-python/gnome-python-extras-2.11.3
-	>=gnome-base/gconf-2.0
-	>=dev-python/gst-python-0.10.0
-	=media-plugins/gst-plugins-ogg-0.10*
-	=media-plugins/gst-plugins-theora-0.10*
-	>=media-libs/libtheora-1.0_alpha6
-	=media-plugins/gst-plugins-gconf-0.10*"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0"
-
-SRC_URI="http://zaheer.merali.org/${P}.tar.bz2"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s /bin/true "${S}"/py-compile
-	echo "py_compile = /bin/true" > common/python.mk
-
-	intltoolize --force --copy || die
-	AT_M4DIR="common" eautoreconf
-}
-
-src_compile() {
-	mkdir -p "${T}/home"
-	export HOME="${T}/home"
-	export GST_REGISTRY=${T}/home/registry.cache.xml
-	addpredict /root/.gconfd
-	addpredict /root/.gconf
-	addpredict /root/.gnome2
-	econf
-	emake
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/istanbul
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/media-video/istanbul/istanbul-0.2.0.ebuild b/media-video/istanbul/istanbul-0.2.0.ebuild
deleted file mode 100644
index 064f1c87cb3d..000000000000
--- a/media-video/istanbul/istanbul-0.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/istanbul-0.2.0.ebuild,v 1.3 2007/01/22 02:20:49 compnerd Exp $
-
-inherit eutils gnome2
-
-KEYWORDS="~x86 ~amd64"
-
-HOMEPAGE="http://live.gnome.org/Istanbul"
-LICENSE="GPL-2"
-SLOT=0
-DESCRIPTION="Istanbul is a screencast application for the Unix desktop"
-IUSE=""
-
-RDEPEND=">=media-libs/gst-plugins-base-0.10.8
-	dev-lang/python
-	>=dev-python/pygtk-2.6
-	>=dev-python/gnome-python-extras-2.11.3
-	>=gnome-base/gconf-2.0
-	>=dev-python/gst-python-0.10.0
-	media-plugins/gst-plugins-ogg
-	media-plugins/gst-plugins-theora
-	>=media-libs/libtheora-1.0_alpha6"
-
-DEPEND="${RDEPEND}"
-SRC_URI="http://zaheer.merali.org/${P}.tar.bz2"
-
-src_compile() {
-	mkdir -p "${T}/home"
-	export HOME="${T}/home"
-	export GST_REGISTRY=${T}/home/registry.cache.xml
-	addpredict /root/.gconfd
-	addpredict /root/.gconf
-	econf
-	emake
-}
diff --git a/media-video/istanbul/istanbul-0.2.2.ebuild b/media-video/istanbul/istanbul-0.2.2.ebuild
index 2f93737bcd9c..dace10f57583 100644
--- a/media-video/istanbul/istanbul-0.2.2.ebuild
+++ b/media-video/istanbul/istanbul-0.2.2.ebuild
@@ -1,69 +1,72 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/istanbul-0.2.2.ebuild,v 1.4 2008/05/29 17:30:45 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/istanbul-0.2.2.ebuild,v 1.5 2009/07/27 09:37:25 eva Exp $
 
-inherit eutils gnome2 python autotools
+EAPI="2"
+GCONF_DEBUG="no"
 
-KEYWORDS="~x86 ~amd64"
+inherit eutils gnome2 python autotools
 
 HOMEPAGE="http://live.gnome.org/Istanbul"
+DESCRIPTION="Istanbul is a screencast application for the Unix desktop"
+SRC_URI="http://zaheer.merali.org/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT=0
-DESCRIPTION="Istanbul is a screencast application for the Unix desktop"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/gst-plugins-base-0.10.8
 	dev-lang/python
 	>=dev-python/pygtk-2.6
-	>=dev-python/gnome-python-extras-2.11.3
 	>=gnome-base/gconf-2.0
 	>=dev-python/gst-python-0.10.0
 	=media-plugins/gst-plugins-ogg-0.10*
 	=media-plugins/gst-plugins-theora-0.10*
-	>=media-libs/libtheora-1.0_alpha6
+	>=media-libs/libtheora-1.0_alpha6[encode]
 	=media-plugins/gst-plugins-gconf-0.10*
-	dev-python/python-xlib"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0"
+	dev-python/python-xlib
 
-SRC_URI="http://zaheer.merali.org/${P}.tar.bz2"
-
-pkg_setup() {
-	if ! built_with_use media-libs/libtheora encode; then
-		eerror "You need to rebuild media-libs/libtheora with USE flag encode."
-		die "media-libs/libtheora needs USE flag encode."
-	fi
-}
+	>=dev-python/egg-python-2.11.3
+	>=dev-python/gnome-vfs-python-2
+	>=dev-python/gconf-python-2"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	dev-util/pkgconfig"
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s /bin/true "${S}"/py-compile
-	echo "py_compile = /bin/true" > common/python.mk
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+	echo "py_compile = $(type -P true)" > common/python.mk
+
+	# fix autoreconf failure, bug #230325
+	epatch "${FILESDIR}/${P}-macro-typo.patch"
 
-	intltoolize --force --copy || die
-	AT_M4DIR="common" eautoreconf
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	mkdir -p "${T}/home"
 	export HOME="${T}/home"
 	export GST_REGISTRY=${T}/home/registry.cache.xml
 	addpredict /root/.gconfd
 	addpredict /root/.gconf
 	addpredict /root/.gnome2
-	econf
-	emake
+
+	gnome2_src_configure
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/istanbul
+	python_mod_optimize $(python_get_sitedir)/istanbul
 }
 
 pkg_postrm() {
+	gnome2_pkg_postrm
 	python_mod_cleanup
 }