Add a workaround for PyQt4 detection. Fixes bug #414467

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 39 insertions, 17 deletions

diff --git a/media-video/qt-recordmydesktop/ChangeLog b/media-video/qt-recordmydesktop/ChangeLog
index a6f0f9e1374e..a86208ad414f 100644
--- a/media-video/qt-recordmydesktop/ChangeLog
+++ b/media-video/qt-recordmydesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/qt-recordmydesktop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qt-recordmydesktop/ChangeLog,v 1.22 2012/04/26 22:48:32 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qt-recordmydesktop/ChangeLog,v 1.23 2012/05/06 20:22:42 hwoarang Exp $
+
+  06 May 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/qt-recordmydesktop-0.3.8-pyqt4.patch,
+  qt-recordmydesktop-0.3.8-r2.ebuild:
+  Add a workaround for PyQt4 detection. Fixes bug #414467
 
   26 Apr 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Remove redundant maintainer entry in metadata.
diff --git a/media-video/qt-recordmydesktop/Manifest b/media-video/qt-recordmydesktop/Manifest
index 004dc25cb940..566a05cbbbb2 100644
--- a/media-video/qt-recordmydesktop/Manifest
+++ b/media-video/qt-recordmydesktop/Manifest
@@ -3,26 +3,27 @@ Hash: SHA512
 
 AUX qt-recordmydesktop-0.3.8-check-for-jack.patch 1082 RMD160 e88dd7e6f781a014cab808412562ad3c1d47623b SHA1 b7b61a7edf3cface616ab1b2c5bc4630d75bb384 SHA256 856df2087621a7eae8101b061bd563bf2be0d01e96fe3000e801745ea7983253
 AUX qt-recordmydesktop-0.3.8-desktopfile.patch 457 RMD160 14229288ae1c4b7e424054b97c6bef35ba83104a SHA1 ff7de38e95faac467bb7c5de68789dd5f56c3fc1 SHA256 2194b9ff84742c9af03aa18983dbfeb4250d076ce537fbd436485a18ae53b545
+AUX qt-recordmydesktop-0.3.8-pyqt4.patch 452 RMD160 3af1ac8e81fa10db36ffecb9cf05f9fce76ef0f0 SHA1 ae08156894b0982f56cf1cc1e82a8b28042b5de0 SHA256 1e24e8f8a572ae43b8f35012a069abab69a127c66af69be8a84e5f1b5565c9f7
 DIST qt-recordmydesktop-0.3.8.tar.gz 185528 RMD160 c3566132a777c46630221782760e1934e609ce68 SHA1 50fc62a9475f3894f2503e4767b3eb89d041f15e SHA256 84e43332ea1974edd8da3edb67456e57a40d3083a23c8d19d8f76b098a226f61
 EBUILD qt-recordmydesktop-0.3.8-r1.ebuild 1050 RMD160 80e4e5a2406cccb5c52a346eaf268e5d89d0e9aa SHA1 9b7fde5b6197e84e5c21c7d845c605a19c560f7b SHA256 6ac082568f8a62760fc018cfcce7fe469e459888fb8f4fad867b00be0dda99b6
-EBUILD qt-recordmydesktop-0.3.8-r2.ebuild 1512 RMD160 5fcc8d5beb87513675920ce0d4f93714778b416c SHA1 45fba01f39b3a5a1c0ece9938cb0f273141641a8 SHA256 ba13b518c53a99ea8d238f7cdcf74c6b0f7901cb334f0f4bb810e5bc67c56fb5
+EBUILD qt-recordmydesktop-0.3.8-r2.ebuild 1561 RMD160 52646b03f69cd640667bf413a29d9932b23dced0 SHA1 ace068900a1ff6abb9fbe1abd893b2058f9edfee SHA256 2daf62a0c700fb57ea79a881e311c52bd63a28169263bc950d1a97a304036a87
 EBUILD qt-recordmydesktop-0.3.8.ebuild 968 RMD160 22f79ab9b1e21093076432a355a83a9eb4d8676a SHA1 a674d8387438ae19b3a644f468edda4c128c4f1b SHA256 524313e5415137c0a107a5ab5ca3b05f0ca572b3ceb72d2047cbb8f40f9ceafa
-MISC ChangeLog 3769 RMD160 7eef6c6861a5700d1d74511247443b52d631c9a4 SHA1 edd096481dca551b4b4c476c74da6b7319eedf30 SHA256 e37ec5b08d05fea8a324d926dc8404ab4d4a0a1fea958edc7f62f0136df7c834
+MISC ChangeLog 3970 RMD160 06d63cca2cb93453bb5896d41f81260c439bfada SHA1 2af4fe6cb267ad8b9c65ad8f298c814b0b5f4276 SHA256 d4894573c7829ba5df0c40a8af2071762b84e8c0d3048f8ff522d6d4c50933ab
 MISC metadata.xml 174 RMD160 c98b535af0dee008b178750caaf1d98acfd6bfaa SHA1 df8a94482d8396a7e34f10d23971991fc2fb93cd SHA256 241c028f9fc5fbb4917bcdf7b92e9fd2b38bcee1d8480869d4383f5631019962
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPmdDZAAoJENXLsxwXqFxyNDYP/ji1iri1iDFZXzrb/Cc/JBk3
-z7lr/5mcBbOgKX2EN3sEwekRKVQpqzdKOXVc3+DXIZ+9e6Yd6HqXjazx8iiylWd2
-jsCFRDCuOsJVEAwnYpQubCFVn+vlHQc9TJLjrsxT9SfkSW2DnT+v1XsNbNyAwQVp
-CILYV6yXABAENTeVuAdV6T7MDbBqRChp1vBMuzgBof37ETkfsj+8l1/RRaAYyIXS
-k+fuAy2MlDDJMvuvZQVmIPNG4SjcXdJVTW4UhI7NBzs7NEnfjpJZgRixAI83P00U
-D/CbROCm5ecyy7kZ1wLhB3iLWPkvsjjXrVOmRE+H3x2aEI3s/Z7VBmbVu+s3R0Wj
-HF9b/pbM7HR85X7vAWgrtGxb8yDy2uO+KyY68/hfUuD64UFy/0q7PxmtkdwAZwjl
-Ehzn12zdzZvRW00nWThSYLcFzjmOw+zTG4VgjHo0GyHXzbHHp75ThKyhCd6CAui3
-wrkXMvtWv35jhPACt67MsYOjzZ2uAT9WOLMFpPMhnkaQNV+88B5LbxeNhMDtN+aE
-hyZ7Q4H1dxnphbtbVjd5neimGmNNACNfnba28SdYt905uAJjdkJd9ww+c3oeifeu
-JlcuqQQBgPVCk181sPqp2HTVWFdHNrIKDlgGabjkdD8lu0z+5+Ew/8jLnTavUzRi
-c9tOXV38lXIbMdEg3jSA
-=vlJ5
+iQIcBAEBCgAGBQJPpt2XAAoJEPqDWhW0r/LC63gQAJjm7w2z+Z1zUtd6MD9OyjyM
+sTyAerXw8QzW2SEwuozE2cdlFSPrPBkSTKl41mJO30NSvQcnYehyqvLjJfNzU63I
+280tenZet3QffYUuy/MiupzCeMhj2BS+0gIAN+gPJuEadKIqMb7bqD31v8MK51f0
+uBXw1uIByZ4fQvJspVnaWKonH+5tyYBf0Y3jKtPo2yiCGXD7ErlYD5Irp0413TWA
+aEYRw4vHMB4sDj8RQ5b52Lkb6JejLe1UOTSgJu0AvBM6abU8LhTjWSq1BW4Mg1ch
+km8kvQFPclEQFx9OSbafi972JlaEXibvttrntOSUA0IsrQNB+pidaSk8GdtjQ3Er
+PSeUHVndg3UIcXhE1rdRVA8hGu6fTGQMU5cwfv2/9N88t6+I4ePiLjn2VB1jPZ0h
+DikA7zS3nPNW8ZqDLa4gaY6NrGpbq5R4uTekNoIJjzIs1DPkPe+8Hvln/8a3fgvB
+WX1eeHKP9vqn6wya3vbO2rsr5im6jVClmEZjub0UZ84KKVp/xL9AOgnuG1dGFRoI
+rLutK0b+9K2oxDM2YlsxhGKu2YdbFEXzRm6KXlxKP0kut4fol0gor/YjkY9qsBN5
+t3cCiAoTlAuvAG465GjHNvt8Sdhxjcfkv0Opw1YpNC8eSPaJ9TKyw/wUU85v7gnH
+mvo/zYwF1snafjjxiCiM
+=H+Mt
 -----END PGP SIGNATURE-----
diff --git a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch
new file mode 100644
index 000000000000..9b2368cfd660
--- /dev/null
+++ b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch
@@ -0,0 +1,14 @@
+Index: qt-recordmydesktop-0.3.8/configure.ac
+===================================================================
+--- qt-recordmydesktop-0.3.8.orig/configure.ac
++++ qt-recordmydesktop-0.3.8/configure.ac
+@@ -50,8 +50,7 @@ fi
+ b=$(echo "$PYQT4_VERSION" | awk 'BEGIN{ FS="." } { print $1 "\n" $2 "\n" $3 }')
+ c=($b)
+ 
+-
+-export PYQT4_MAJOR=${c[[0]]}
++export PYQT4_MAJOR=${c[[0]]/snapshot-/}
+ export PYQT4_MINOR=${c[[1]]}
+ 
+ if test $PYQT4_MAJOR != 4; then
diff --git a/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r2.ebuild b/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r2.ebuild
index 9607d817ca04..a6cbbe17ed6e 100644
--- a/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r2.ebuild
+++ b/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r2.ebuild,v 1.1 2012/04/26 08:26:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r2.ebuild,v 1.2 2012/05/06 20:22:42 hwoarang Exp $
 
 EAPI=4
 
@@ -34,6 +34,7 @@ DOCS=( AUTHORS ChangeLog NEWS README )
 PATCHES=(
 	"${FILESDIR}/${P}-check-for-jack.patch"
 	"${FILESDIR}/${P}-desktopfile.patch"
+	"${FILESDIR}/${P}-pyqt4.patch"
 )
 
 pkg_setup() {
@@ -43,6 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	base_src_prepare
+	eautoreconf
 
 	# these deps are required by PyQt4, not this package
 	sed -e '/^PKG_CHECK_MODULES/d' -i configure.ac || die "sed failed"