Properly regenerate .moc files.

Package-Manager: portage-13775-svn/cvs/Linux x86_64

4 files changed, 15 insertions, 38 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 0cc1d7ac4ee7..f8edece29ca2 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.94 2009/07/04 17:42:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.95 2009/07/04 18:35:11 arfrever Exp $
+
+  04 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pinentry-0.7.6.ebuild, -files/pinentry-0.7.6-qt4-moc-fix.diff:
+  Properly regenerate .moc files.
 
 *pinentry-0.7.6 (04 Jul 2009)
 
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index ba1064d086a1..3bb65eb5257c 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a
-AUX pinentry-0.7.6-qt4-moc-fix.diff 978 RMD160 a39b385fec8056be60b52dbe8f8168e7d9a54c1a SHA1 2d94ee8e56d6bce870a992eb43a7223eae812492 SHA256 9a4a4a6ed397c5231f8cfccabe7e4d1bfd070623e3e898c01de0073ab02a7d54
 AUX pinentry-gmem.patch 880 RMD160 82c41513e47be43a801ec0d2e6cf89857b5e373f SHA1 34abb7caa0aecbd4d8f592695c30e40311425688 SHA256 484dafa00a7fe6e04380d32f3a468082d68923c11f8e3fb007e09018b4b617f5
 DIST pinentry-0.7.5.tar.gz 422801 RMD160 4ed9d06981b647f9fd39b9d30651a36307869c2d SHA1 6699a1ff94c649e8905199d480c6412cc43bad3d SHA256 cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172
 DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab
 EBUILD pinentry-0.7.5-r1.ebuild 2585 RMD160 8b2ffa6e650a29a6d764bade182973f8d063954f SHA1 584e27493300e9633f9dcf77d2f68af82d23f908 SHA256 d6a4cb6d6963900a7fa6147a9670814f071d08ac49be922ae038b3d99a2744a0
 EBUILD pinentry-0.7.5.ebuild 2135 RMD160 5d7f62ddfb798c37d78679dd5188b4280e39c905 SHA1 02807101b19e9bd66f53751cd8ab5dfebe818d87 SHA256 f17d67266771bd12fa532fe4a58949b61545ff0627c62e2ce293266e4bf227bf
-EBUILD pinentry-0.7.6.ebuild 2685 RMD160 63497cb2ca2def5d6019164f4e69d2d8273efbc4 SHA1 482db3581bbf9dd160f4ea9cf5ee9b0738b47e48 SHA256 43494e010f2222835271963f20873909c312e410440de1d33b558e8c88357969
-MISC ChangeLog 12536 RMD160 894efcc3d3cfb3884689a06aa2b3223324cb57a8 SHA1 1207274f18c23558dc9ee5bf6183d3efdfba85f3 SHA256 14bc28f536a32b350c56bfac910019c7edc8c32255e677f5184f756a5d030f5b
+EBUILD pinentry-0.7.6.ebuild 2775 RMD160 493c203182359e1104db4f0256567249af5de4af SHA1 5897da99280892143cca9b0a964243ba44e7f296 SHA256 4176f1a59ee46823745abacb8853e2c0c45a6b3a2d3565fd4f2e4a56dee6bf82
+MISC ChangeLog 12709 RMD160 84ac6d80ee135d21e355969e853b4ccd80f148ac SHA1 71393bf14d9ff2308462134f936c3fc86ed6aac4 SHA256 0b9a058006284e33c605d139e54884bd9ac87a0fd82d7c1da7cb4da3e9be1a39
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iEYEARECAAYFAkpPlIAACgkQI1lqEGTUzyRHuACfY98CG+QX15kZrNUJmTXfJTMT
-QyIAnjYci2dKQiDMFp9svonQ9lNIk/pu
-=Nsj3
------END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/files/pinentry-0.7.6-qt4-moc-fix.diff b/app-crypt/pinentry/files/pinentry-0.7.6-qt4-moc-fix.diff
deleted file mode 100644
index d930ee6c2631..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.7.6-qt4-moc-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- pinentry-0.7.6/qt4/pinentrydialog.moc
-+++ pinentry-0.7.6/qt4/pinentrydialog.moc
-@@ -10,7 +10,7 @@
- #include "pinentrydialog.h"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'pinentrydialog.h' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 59
-+#elif Q_MOC_OUTPUT_REVISION < 59
- #error "This file was generated using the moc from 4.4.1. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
---- pinentry-0.7.6/qt4/qsecurelineedit.moc
-+++ pinentry-0.7.6/qt4/qsecurelineedit.moc
-@@ -10,7 +10,7 @@
- #include "qsecurelineedit.h"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'qsecurelineedit.h' doesn't include <QObject>."
--#elif Q_MOC_OUTPUT_REVISION != 59
-+#elif Q_MOC_OUTPUT_REVISION < 59
- #error "This file was generated using the moc from 4.4.1. It"
- #error "cannot be used with the include files from this version of Qt."
- #error "(The moc has changed too much.)"
diff --git a/app-crypt/pinentry/pinentry-0.7.6.ebuild b/app-crypt/pinentry/pinentry-0.7.6.ebuild
index 53da825388d8..f3d2af3ef413 100644
--- a/app-crypt/pinentry/pinentry-0.7.6.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.1 2009/07/04 17:42:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.2 2009/07/04 18:35:11 arfrever Exp $
 
 EAPI="1"
 
@@ -42,7 +42,13 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-0.7.5-grab.patch"
-	epatch "${FILESDIR}/${PN}-0.7.6-qt4-moc-fix.diff"
+
+	if use qt4; then
+		local file
+		for file in qt4/*.moc; do
+			/usr/bin/moc ${file/.moc/.h} > ${file} || die "moc ${file} failed"
+		done
+	fi
 }
 
 src_compile() {