Fix build failure with recent automake (bug #407683, thanks to Helmut Jarausch et al.) Add git snapshot containing numerous serious bug fixes, and some further fixes from the Debian patchset.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

9 files changed, 246 insertions, 17 deletions

diff --git a/media-video/istanbul/ChangeLog b/media-video/istanbul/ChangeLog
index d5aa4453b09b..bf18b9e50597 100644
--- a/media-video/istanbul/ChangeLog
+++ b/media-video/istanbul/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-video/istanbul
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/ChangeLog,v 1.20 2012/10/25 20:50:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/ChangeLog,v 1.21 2012/11/29 09:38:47 tetromino Exp $
+
+*istanbul-0.2.2.1_pre20120909 (29 Nov 2012)
+
+  29 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  istanbul-0.2.2.ebuild, +istanbul-0.2.2.1_pre20120909.ebuild,
+  +files/istanbul-0.2.2-desktop-file.patch,
+  +files/istanbul-0.2.2-dir-overwrite.patch,
+  +files/istanbul-0.2.2-fix-grab-xid.patch,
+  +files/istanbul-0.2.2-fix-preview-window.patch,
+  +files/istanbul-0.2.2-noalsa.patch:
+  Fix build failure with recent automake (bug #407683, thanks to Helmut
+  Jarausch et al.) Add git snapshot containing numerous serious bug fixes, and
+  some further fixes from the Debian patchset.
 
   25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> istanbul-0.2.2.ebuild:
   Pin gstreamer dependencies to slot 0.10.
diff --git a/media-video/istanbul/Manifest b/media-video/istanbul/Manifest
index 636528198ce4..a8597eaacc61 100644
--- a/media-video/istanbul/Manifest
+++ b/media-video/istanbul/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX istanbul-0.2.2-desktop-file.patch 517 SHA256 fb089ce18fbd28c395a05221d5e8521a981d39c470a6bca5c53a3394112aa72d SHA512 e1ce691ecb8e82fe4ce67b96a78c080fb5be2c6aa30d70fda10b17b9af1beef9fa4725f3e05d8b15523e87b96bb74623b324cd00ad1ee065b3f99c921f904883 WHIRLPOOL 6c78b24ea21f6c5b8d771fe7e7f713a84fbb7cf1398226dd426e6045bde2a4774594cecd03875225323d2a7d7c0edbc7754917d5450046f9c72ecea1b5d536ad
+AUX istanbul-0.2.2-dir-overwrite.patch 1551 SHA256 156eff575315411a958c98a6dc5e4fb0fe98197646743f927d4101b787f86243 SHA512 a1f47ee22b69a1179ef6fa948e2f22d57a39d6984efed6812baa1ef15ad9b21dffbf3a7f37d2a73e4da284083ada35cbe3f334dde302e99ba8d345c4f2d40e81 WHIRLPOOL a076f6c3afd95ace3d2ec0059fe7d7244e7135ef2d74eb9df806aeaa230f27938dd9b39ad741898b7c1a36e9426f7602c23a210985b173b77b7d94c52a0ba291
+AUX istanbul-0.2.2-fix-grab-xid.patch 1253 SHA256 ad365dbedee9678cf2141e9a7bc16f775d19f36c8c409ed1b458b3bc1bf9f516 SHA512 1b5d3a6846d922f9badce8de0cadf2ce038832e6822c6a81873f57c8b7aa5621d7d62b3bb1a77dcedb9be3a89535b7e87240778c56137df486c87f1bcdba0bdd WHIRLPOOL 780e0f712111012d6b4b6eacf606a483d6db3df3c459102f554ac3f405fd63a8bddbc2b4e9763ba746397cf39242dedbce56f826a4f0548df7cf3808f8467e57
+AUX istanbul-0.2.2-fix-preview-window.patch 1015 SHA256 4cd9a64dd43a9c6698c2a4c48baf4918f5a0717b5c2aebdd961aa19426e8ad9a SHA512 bd97d40b1a875c633812ac4f31a965eddb5a67514dcae18d32a7bc4799f6fae09e4f335076c2aaee8e48e2cff26aed51d1aca5c892d45551da828fb3c520d5d3 WHIRLPOOL 041b6d4f3b8679396d515786d744ed3a3e7274157aa40b5b2ff88710ed80cdea788d27457f312e4dde85cd79930277f3c33848af97423e5fcd0105c2b3543a71
 AUX istanbul-0.2.2-macro-typo.patch 675 SHA256 e3adeadd35947be1f253f866a12abaab060a37ce5e6ddf8bf74a7c41c01e1455 SHA512 a0c835519191bb152e7e90d810191f2fd0925e5990d69a1c4a20f90eb2aa190d1ea3723c42423953a70d72aa8060c961639ce4b916432d09befc95b86b388c1c WHIRLPOOL 56ae2881d57c97cdd041a1706fe376ca11137de128d55b58f0919c8ca00c5d8058e822cb1cf1eb4845a67111f9b86ac14f09812dd8aa97a45bf9d79313dcbdbb
-DIST istanbul-0.2.2.tar.bz2 349075 SHA256 3baa2462ecf1b13d0d95cd035fe0f0fc0fcc3df8cb04a3b7f237e90e9a40acd5
-EBUILD istanbul-0.2.2.ebuild 1764 SHA256 9b4a69847df00b2fddf4f017a18c2172b61a0bf9fd83a7091c596d073d937c2e SHA512 6a402bd7fdf041e2136732585cb2c10d5afec2bd1acd0cc6b1638d8290572f9099481d0c48aeb646901355be3a0e89aab5abe9e2145e0ac1c8f98ccaab396da1 WHIRLPOOL 044d4b2bc053b1206500820ccad2d0345470c58729ec38eed4634004907619527acb8957039d4505f127970c601aebaabf007667dc6fa4c1e3d8d99ae56b1b6b
-MISC ChangeLog 2870 SHA256 78fa7a9eb20e8f305a73f619398adbd51aa39868e3ac9c358dd9c5b3158bc51b SHA512 19dad31c28c3053d605848a814fd59946b2cd622d202a9dbdd3607bcc51f15d3da88c7ce94915293c9f759d8c54608189adf8fe8c661b0359862f4f90bd51ddc WHIRLPOOL 5311b68a2c3d05d3a421b7b4053497b4ec29746a062e3cba611fb32bb862cf6d9362c729cfce6cb07bdc1be73c33b39b1d400b12f63912f1283b396535f65e46
+AUX istanbul-0.2.2-noalsa.patch 878 SHA256 8103f3733b804d1a993a7104bf3bc322a35e28ed59c126709d6d30c95068accb SHA512 0afc35596902e790710f506b8b124928d1995b0c2ac1f176665255e33ce6957828bb68a262ba0895e08645e4c3285660a6ae0a7eae683ee230c38c5a21e63cd6 WHIRLPOOL 7419c609167cb28a34dd607b9999ddd724d5d947bae4c2a10c2797cd21caef61e49871a25c8d2b443927171f2a7f478bb60afaae210a4f91bc68cf73bdde2a86
+DIST istanbul-0.2.2.1_pre20120909.tar.bz2 407102 SHA256 596c80bb94bf99b52110b7e2676b2e3008e3e82290319fdf1f5a31ee535de8a9 SHA512 f0e03a251781e07392bee3401a4ec4bb61719be8d66160228aa28a48774c393e4f4de6538bbd041285e85a96d85a6f103c76d6a9f5fb60eb424f7397e2f2809c WHIRLPOOL beed58df0244e4b957281760d8051aa7b5ec8605b0d9f76ae5a38a463b2e9948ce276d9e53cde0fbd167c1b1a2cfe4cd40e5c64049e2dd762fb13352eb1cf107
+DIST istanbul-0.2.2.tar.bz2 349075 SHA256 3baa2462ecf1b13d0d95cd035fe0f0fc0fcc3df8cb04a3b7f237e90e9a40acd5 SHA512 b7d5b99cb3860414f4139fd1fa887e4d58f99fc5c94f9d24d7a96f03e82ec7338d733e3ab7d8b8db6ae2c00f69aa48a099b957a23e3827c7d6505ab92bbb5c60 WHIRLPOOL 07a8b9406a017f8ac36f3062620dac507e034e5a5eadb401dc189e9f34b83d3549475fe63191cd2aad898a30a8f6afcc7128a6febed127efa7546decdca4660d
+EBUILD istanbul-0.2.2.1_pre20120909.ebuild 2041 SHA256 d72d8f3d1d57a13a417258716071d30fe35bf13249d54ed5ec1a2024adf8ea88 SHA512 1e4776fbf8d25b4e2fd004a021c57a7a8d668a7802b60dc822752430cf0bca704f5fd7c797c529d1b1c81700ed5da10c07c019d4623634c3da4a131075fa6782 WHIRLPOOL e2417695d1f35cfc3e9641664293b878f48709828d7167baefb525a56d13842faf0d002828401cc9ef0019a9689e092162ff7b1c107b86525180661f6245345c
+EBUILD istanbul-0.2.2.ebuild 1655 SHA256 d299d12cbcd1511c2d72e4ace8c00058ab9a1011da83f1150ce7006f08a3e721 SHA512 3c21cac7404acccb67ec53ce7cf70c4c7dc2b86f5e822f377ab575d43e0a9a42fbc2934bfdedea2230ca1206ccf77290e4028e62c13ea589ff014ce21b59a70d WHIRLPOOL 124c5f9930f26e928959e13220522983f74c1dcd8d561ed6884d6bd334a5cb71246719bfb14352a378b42efe6aa9c929556c06c49d8a86c81333282224650ef8
+MISC ChangeLog 3463 SHA256 503922f2d6f2c9624977f2a46810eedd753855b9492bac93d132151893531fa4 SHA512 964959b46f15fd9997ffcce996435aee0b268a91acfae22f426937ff33cede26de1e1e4d202196fd6b10ea6f36dde7f9250b7ce92ea80ec2c0f092de44963798 WHIRLPOOL 75878ddfc4632c09f01d9da7c0ef44b3aa031f08f856d400cb3ebeb515029fa37c112d301a134760c998b18a908ea3b9a364443a332948645d6a2a5177dd720a
 MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCJpjQACgkQ1fmVwcYIWAYnNwCeMk/tPrcuBRa8rGP+CHDGr1D+
-9wYAn20Je/UHxtXrPuQKw8G11HY66tSc
-=E71S
+iQEcBAEBCAAGBQJQty0oAAoJEJ0WA1zPCt1ht/MIALwOG9lxsC/ZD3mmVOE6DOYX
+n2K7wISm0oOkB30+osLq8nb+PwoLCsGNugXXri5y58b0ATOJwX9aDIBa8g3KgQy8
+Z0+0VU1qlTxJzbeEN0iTOjQivNbqoKZeFuDTS5M2FY3a8wQxJkrh19mL1SS13Eql
+ILjZnGF1Coxfv9Upa3LZVyUe9Q5IpW/v1XE6yzut14jsWN2nl0645Rui+4jEFL53
+9KQzBG99D3X4qMsYXZQcg4EZaYY6lTDNjxrjBWT/UCznqYMErOjtbh8EURHFArXp
++SL224/Ly3jq1HgjLhphrpuxdrczZPISGwi64Si+tk6pw6ewM6EJ7iUdWBCAr9M=
+=z5Rg
 -----END PGP SIGNATURE-----
diff --git a/media-video/istanbul/files/istanbul-0.2.2-desktop-file.patch b/media-video/istanbul/files/istanbul-0.2.2-desktop-file.patch
new file mode 100644
index 000000000000..b71df11077c2
--- /dev/null
+++ b/media-video/istanbul/files/istanbul-0.2.2-desktop-file.patch
@@ -0,0 +1,18 @@
+diff --git a/data/istanbul.desktop.in b/data/istanbul.desktop.in
+index 4235410..a1b5772 100644
+--- a/data/istanbul.desktop.in
++++ b/data/istanbul.desktop.in
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Istanbul Desktop Session Recorder
+ _GenericName=Desktop Session Recorder
+ _Comment=Record a video of your desktop session
+ Exec=istanbul
+ Terminal=false
+ Type=Application
+-Icon=istanbul.png
+-Categories=GNOME;Application;AudioVideo;
++Icon=istanbul
++Categories=GTK;GNOME;AudioVideo;
+ StartupNotify=false
diff --git a/media-video/istanbul/files/istanbul-0.2.2-dir-overwrite.patch b/media-video/istanbul/files/istanbul-0.2.2-dir-overwrite.patch
new file mode 100644
index 000000000000..c5873874d3c2
--- /dev/null
+++ b/media-video/istanbul/files/istanbul-0.2.2-dir-overwrite.patch
@@ -0,0 +1,31 @@
+From: Luca Bruno <lucab@debian.org>
+Subject: istanbul: saving screencasts can overwrite directories
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592258
+
+diff --git a/istanbul/main/save_window.py b/istanbul/main/save_window.py
+index dc79ce8..87e5ab0 100644
+--- a/istanbul/main/save_window.py
++++ b/istanbul/main/save_window.py
+@@ -256,7 +256,7 @@ class SaveWindow(gtk.Window):
+             try:
+                 trysave = gnomevfs.xfer_uri(gnomevfs.URI("file://%s" % self.location), 
+                     gnomevfs.URI(self.filechooser.get_uri()), 
+-                    gnomevfs.XFER_DELETE_ITEMS,
++                    gnomevfs.XFER_REMOVESOURCE,
+                     gnomevfs.XFER_ERROR_MODE_ABORT, 
+                     gnomevfs.XFER_OVERWRITE_MODE_ABORT)
+             except gnomevfs.FileExistsError:
+@@ -272,10 +272,12 @@ class SaveWindow(gtk.Window):
+                 dialog.hide()
+                 if res == gtk.RESPONSE_YES:
+                     try:
++                        if os.path.isdir(self.filechooser.get_uri()[7:]):
++                            raise Exception()
+                         trysave = gnomevfs.xfer_uri(
+                         gnomevfs.URI("file://%s" % self.location), 
+                         gnomevfs.URI(self.filechooser.get_uri()), 
+-                        gnomevfs.XFER_DELETE_ITEMS,
++                        gnomevfs.XFER_REMOVESOURCE,
+                         gnomevfs.XFER_ERROR_MODE_ABORT, 
+                         gnomevfs.XFER_OVERWRITE_MODE_REPLACE)
+                     except Exception:
diff --git a/media-video/istanbul/files/istanbul-0.2.2-fix-grab-xid.patch b/media-video/istanbul/files/istanbul-0.2.2-fix-grab-xid.patch
new file mode 100644
index 000000000000..95f534aca284
--- /dev/null
+++ b/media-video/istanbul/files/istanbul-0.2.2-fix-grab-xid.patch
@@ -0,0 +1,36 @@
+From: Jef Spaleta <jspaleta@gmail.com>
+Subject: Try to get the xid on realization of the videowidget
+Origin: upstream
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=604938
+Bug-Debian: http://bugs.debian.org/554568
+
+Index: istanbul-0.2.2/istanbul/main/save_window.py
+===================================================================
+--- istanbul-0.2.2.orig/istanbul/main/save_window.py	2010-07-08 10:38:56.609390459 +0200
++++ istanbul-0.2.2/istanbul/main/save_window.py	2010-07-08 10:38:53.153107943 +0200
+@@ -35,8 +35,13 @@
+     def __init__(self):
+         gtk.DrawingArea.__init__(self)
+         self.imagesink = None
++        self._xid = None
+         self.unset_flags(gtk.DOUBLE_BUFFERED)
+ 
++    def do_realize(self):
++        gtk.DrawingArea.do_realize(self)
++        self._xid = self.window.xid
++
+     def do_expose_event(self, event):
+         if self.imagesink:
+             self.imagesink.expose()
+@@ -45,9 +50,9 @@
+             return True
+ 
+     def set_sink(self, sink):
+-        assert self.window.xid
++        assert self._xid is not None
+         self.imagesink = sink
+-        self.imagesink.set_xwindow_id(self.window.xid)
++        self.imagesink.set_xwindow_id(self._xid)
+ 
+ class SaveWindow(gtk.Window):
+     UPDATE_INTERVAL = 500
diff --git a/media-video/istanbul/files/istanbul-0.2.2-fix-preview-window.patch b/media-video/istanbul/files/istanbul-0.2.2-fix-preview-window.patch
new file mode 100644
index 000000000000..181c0622e41b
--- /dev/null
+++ b/media-video/istanbul/files/istanbul-0.2.2-fix-preview-window.patch
@@ -0,0 +1,23 @@
+From: Jef Spaleta <jspaleta@gmail.com>
+Subject: Additional patch to fix preview video widget in save_window.py
+Origin: upstream
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=604938
+Bug-Debian: http://bugs.debian.org/554568
+
+Index: istanbul-0.2.2/istanbul/main/save_window.py
+===================================================================
+--- istanbul-0.2.2.orig/istanbul/main/save_window.py	2010-07-08 10:39:51.433390429 +0200
++++ istanbul-0.2.2/istanbul/main/save_window.py	2010-07-08 10:39:49.184894943 +0200
+@@ -143,8 +143,11 @@
+             yoptions=0)
+         table.set_row_spacing(0,6)
+         table.set_row_spacing(1,6)
++        def init_videowidget( widget):
++            widget._xid = widget.window.xid
++            self.player.pause()
+         self.videowidget.connect_after('realize',
+-                                       lambda *x: self.player.pause() )
++            init_videowidget )
+         self.videowidget.set_size_request(width, height)
+ 
+         # create save, edit, cancel buttons
diff --git a/media-video/istanbul/files/istanbul-0.2.2-noalsa.patch b/media-video/istanbul/files/istanbul-0.2.2-noalsa.patch
new file mode 100644
index 000000000000..772dc700c777
--- /dev/null
+++ b/media-video/istanbul/files/istanbul-0.2.2-noalsa.patch
@@ -0,0 +1,17 @@
+From: Luca Bruno <lucab@debian.org>
+Subject: istanbul: Uninstallable on kfreebsd-* (depends on gstreamer0.10-alsa)
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591739
+
+Index: istanbul-0.2.2/istanbul/main/screencast.py
+===================================================================
+--- istanbul-0.2.2.orig/istanbul/main/screencast.py	2010-08-17 11:38:02.898762661 +0200
++++ istanbul-0.2.2/istanbul/main/screencast.py	2010-08-17 11:38:51.154511463 +0200
+@@ -95,7 +95,7 @@
+             if Preferences().has_gconf():
+                 asource = 'gconfaudiosrc name=audiosource'
+             else:
+-                asource = 'alsasrc name=audiosource'
++                asource = 'autoaudiosrc name=audiosource'
+             acappipeline = '%s ! audioconvert ! vorbisenc' % asource
+ 
+         vencode_pipeline = 'video/x-raw-yuv,width=%d,height=%d,framerate=%s '\
diff --git a/media-video/istanbul/istanbul-0.2.2.1_pre20120909.ebuild b/media-video/istanbul/istanbul-0.2.2.1_pre20120909.ebuild
new file mode 100644
index 000000000000..33aae917ce2e
--- /dev/null
+++ b/media-video/istanbul/istanbul-0.2.2.1_pre20120909.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 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.1_pre20120909.ebuild,v 1.1 2012/11/29 09:38:47 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+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"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2" # Note: not GPL-2+
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/gst-plugins-base-0.10.8:0.10
+	>=dev-python/pygtk-2.6
+	>=gnome-base/gconf-2
+	dev-python/gst-python:0.10
+	media-plugins/gst-plugins-ogg:0.10
+	media-plugins/gst-plugins-theora:0.10
+	>=media-libs/libtheora-1.0_alpha6[encode]
+	media-plugins/gst-plugins-gconf:0.10
+	dev-python/python-xlib
+
+	>=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
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-0.2.2.1"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_clean_py-compile_files
+	cp py-compile common/py-compile-destdir || die
+
+	# .desktop file validation failures
+	epatch "${FILESDIR}/${PN}-0.2.2-desktop-file.patch"
+
+	# important Debian patches
+	epatch "${FILESDIR}/${PN}-0.2.2-fix-grab-xid.patch"
+	epatch "${FILESDIR}/${PN}-0.2.2-fix-preview-window.patch"
+	epatch "${FILESDIR}/${PN}-0.2.2-dir-overwrite.patch"
+	epatch "${FILESDIR}/${PN}-0.2.2-noalsa.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+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
+
+	gnome2_src_configure
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize istanbul
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup istanbul
+}
diff --git a/media-video/istanbul/istanbul-0.2.2.ebuild b/media-video/istanbul/istanbul-0.2.2.ebuild
index db286be3e511..68d82b4967bd 100644
--- a/media-video/istanbul/istanbul-0.2.2.ebuild
+++ b/media-video/istanbul/istanbul-0.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.10 2012/10/25 20:50:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/istanbul-0.2.2.ebuild,v 1.11 2012/11/29 09:38:47 tetromino Exp $
 
-EAPI="3"
+EAPI="5"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2"
 
@@ -12,7 +12,7 @@ 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"
+LICENSE="GPL-2" # Note: not GPL-2+
 SLOT=0
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -40,18 +40,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-	echo "py_compile = $(type -P true)" > common/python.mk
+	python_clean_py-compile_files
+	cp py-compile common/py-compile-destdir || die
 
 	# fix autoreconf failure, bug #230325
 	epatch "${FILESDIR}/${P}-macro-typo.patch"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_configure() {