fix compilation with qt4 4.7, remove pre-built .moc files

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/app-admin/packagekit-qt4/ChangeLog b/app-admin/packagekit-qt4/ChangeLog
index 022c31a2761c27925ed35be89030e6ef70636d11..e64d093417a3a3b6591211296fc771d1d9f6611d 100644 (file)
--- a/app-admin/packagekit-qt4/ChangeLog
+++ b/app-admin/packagekit-qt4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/packagekit-qt4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/ChangeLog,v 1.5 2011/09/05 20:05:15 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/ChangeLog,v 1.6 2011/09/05 20:36:10 lxnay Exp $
+
+  05 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> packagekit-qt4-0.6.18.ebuild:
+  fix compilation with qt4 4.7, remove pre-built .moc files
 
   05 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> packagekit-qt4-0.6.16.ebuild,
   packagekit-qt4-0.6.17.ebuild, packagekit-qt4-0.6.18.ebuild:

diff --git a/app-admin/packagekit-qt4/Manifest b/app-admin/packagekit-qt4/Manifest
index 5fe62e7691090c92053f7d5ac29367abb3bcd28a..50eade0125fefab712902dae1de13173b0385221 100644 (file)
--- a/app-admin/packagekit-qt4/Manifest
+++ b/app-admin/packagekit-qt4/Manifest
@@ -3,6 +3,6 @@ DIST PackageKit-0.6.17.tar.xz 7890112 RMD160 2121081f2155324c592b3e3c7c8a5ac88c3
 DIST PackageKit-0.6.18.tar.xz 7890956 RMD160 221e8dfd5d826075ff30a25dea6d335fb755e2f5 SHA1 904cdf2156dfe7f350b7657fad1e69150243b277 SHA256 38e22db73360b50e4b495d03a8d7e44e1fd1525ac44fb4a3bbac99ad21779c32
 EBUILD packagekit-qt4-0.6.16.ebuild 1587 RMD160 fa64b572a712a3af3029bc1d6aa6bf4e931ea780 SHA1 279d0488a183b2e81e0c350bffa5c50c7540b41a SHA256 38f9112889e6412ac22cc0eeea2a27936203a363790ad47ef79acc86006399b2
 EBUILD packagekit-qt4-0.6.17.ebuild 1587 RMD160 11319a16efa9827e9f87c65037759590546d4f6e SHA1 1caaebcd6a934723c45e7f75027032416a37bd47 SHA256 49c40c52aa0556e0ecb647ecea7662f0759e3906952a8339715ea46b2c8cdc1d
-EBUILD packagekit-qt4-0.6.18.ebuild 1587 RMD160 e8ab8ef03c12dc125284512cdc4d71b6fbada4c0 SHA1 01e5bffa20209be260585a1d50375db8c72a5ebf SHA256 fcac7f4d9c53fd19360260f34fb38424a65f975d7f92254d93a9155a494ba7c6
-MISC ChangeLog 979 RMD160 9e9a092cf9c5523d13bc5df574d3d711073d8c74 SHA1 3f6694c2ca17f698613de872a24b21ffa701e6d0 SHA256 d1bbaf72eb6d575aade858643ee1e7ae40391c468058a781c3876ffd19c12a38
+EBUILD packagekit-qt4-0.6.18.ebuild 1743 RMD160 7c2a0a476f5e4717b4a6c01fce4c9d17fff846b2 SHA1 f6f45c3eebcde44aa1b2b10a2e5e7b29b57f49a4 SHA256 fa269445814bf2fd5fbe43e71ff0848b80fdd0884a646a1c4bfcfaa799b9c967
+MISC ChangeLog 1120 RMD160 443f4357bfa0e4d3351b639544e8072444076c03 SHA1 1f1d6facaffa496d5afde1a74c2d0b3efab1d312 SHA256 01f003d24b7c5939b749fa775ed36dbf999cb73c82a7c79e72a287fb68365c49
 MISC metadata.xml 271 RMD160 c44f30edec983687eb994746b3e46bf21a10fffb SHA1 b1a6b7bb25b8fe6a58429094edc642419aeb7b79 SHA256 1d3b6760c6958f8d15cea94022455ec98529387abd2cfcf8c91bfeac9a142b00

diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
index 4037c5d02645bc03f6be4b13612311c6a0b37e95..9f0335a024c465c1f80abd8d4dd4ea699cdb502d 100644 (file)
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.2 2011/09/05 20:05:15 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.3 2011/09/05 20:36:10 lxnay Exp $
 
 EAPI="3"
 
@@ -56,6 +56,12 @@ src_configure() {
 src_compile() {
        for qtdir in packagekit-qt packagekit-qt2; do
                cd "${S}"/lib/${qtdir} || die
+               # fix buildsystem, make .moc files to get regenerated
+               if [[ "${qtdir}" = "packagekit-qt" ]]; then
+                       rm src/*.moc || die
+               else
+                       rm *.moc || die
+               fi
                emake || die "emake install failed"
        done
 }