Fix that thing so it actualy builds.

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

5 files changed, 48 insertions, 8 deletions

diff --git a/kde-misc/qtrans/ChangeLog b/kde-misc/qtrans/ChangeLog
index dcab739c99d3..6bcb93b50201 100644
--- a/kde-misc/qtrans/ChangeLog
+++ b/kde-misc/qtrans/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/qtrans
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/qtrans/ChangeLog,v 1.5 2011/01/31 06:25:39 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/qtrans/ChangeLog,v 1.6 2011/04/28 21:16:16 scarabeus Exp $
+
+  28 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.2.2.6-define_return.patch,
+  +files/0.2.2.6-do_not_install_files.patch, qtrans-0.2.2.6.ebuild:
+  Fix that thing so it actualy builds.
 
   31 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> -qtrans-0.2.2.2.ebuild,
   qtrans-0.2.2.6.ebuild:
diff --git a/kde-misc/qtrans/Manifest b/kde-misc/qtrans/Manifest
index fa8018c1d1b9..361a39423999 100644
--- a/kde-misc/qtrans/Manifest
+++ b/kde-misc/qtrans/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.2.2.6-define_return.patch 405 RMD160 96dfff7ddf087d97185556c56e75d6e8fe5320cd SHA1 8d1ce55546d74663965a668df2df00b749eeb0fd SHA256 0c62b41977058fd154fc72b7e0132f800f871542e2f7dc5247a3e413656e0e72
+AUX 0.2.2.6-do_not_install_files.patch 395 RMD160 8714e3da329361c08cdd2da31bea70cb19f32051 SHA1 8278db526523e377cc9b1ab29e2247c17049c0b2 SHA256 a212196be37b7c113101195a374dd15d72f9ab5e9a0338732abefe319c6e0cd2
 DIST 74876-qtrans-0.2.2.6.tar.gz 124567 RMD160 f5409297fb89db9a0415fe7f31068b35e351a09b SHA1 48d11495cec9cf395ee8eb368685c25c66c4ce7c SHA256 d38a756ca89ba5e6d8fdf194ed5c977b8a09da476f197d64854c7d9d7ff5b25d
-EBUILD qtrans-0.2.2.6.ebuild 637 RMD160 7f7a2f1bf72143d72c37e0a5690f0af90bf3a97a SHA1 1f445fae51feec6659312679bbea90c1d74d33d9 SHA256 5861a5765ce54a2474b46b4dcd8209d1b7b842f5c61bbde019f7e111d930e042
-MISC ChangeLog 939 RMD160 7b965144079516180644ded8849760d4b6db1bd5 SHA1 c4f4fcb9981e59cebf2e8c7e2ad524b56289f0bd SHA256 b2097b4d570708eb99be331aa53d962632fcf3967f239a429978982c849849fe
+EBUILD qtrans-0.2.2.6.ebuild 642 RMD160 810988d3e62c144fdd482be447f606b9a8c2585a SHA1 bfdcd415cbeeb0b8523657d55555905db35e08c7 SHA256 c9bb565e5bc0182c90a44d12063633b78cd15d9d1b9e25dc34bf7a95d4314d70
+MISC ChangeLog 1140 RMD160 0a1165681c27e02d9b313abe612b2a404bfd02c0 SHA1 af2ff3b66e5fe9d115e06b5735a8708595fe115f SHA256 68bd7ac67a2864704725ceec85dbe25dcd1eec0c341fad5505961b5ba02e49da
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk252O4ACgkQHB6c3gNBRYcAkwCfVTfXSl8Z9TlU8nfM0pBLMsDD
+nl4AoKrIZvBmN8xi+xYEHkUSq3hPnrh0
+=hCDe
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/qtrans/files/0.2.2.6-define_return.patch b/kde-misc/qtrans/files/0.2.2.6-define_return.patch
new file mode 100644
index 000000000000..2e66a4dfacf6
--- /dev/null
+++ b/kde-misc/qtrans/files/0.2.2.6-define_return.patch
@@ -0,0 +1,12 @@
+diff -urN qtrans-0.2.2.6.old/src/plugins/stardict/stardict.cpp qtrans-0.2.2.6/src/plugins/stardict/stardict.cpp
+--- qtrans-0.2.2.6.old/src/plugins/stardict/stardict.cpp	2011-04-28 23:08:08.000000000 +0200
++++ qtrans-0.2.2.6/src/plugins/stardict/stardict.cpp	2011-04-28 23:11:33.000000000 +0200
+@@ -1123,7 +1123,7 @@
+ 
+ QString StarDict::parseData(const char *data)
+ {
+-
++	return "Not implemented";
+ }
+ 
+ 
diff --git a/kde-misc/qtrans/files/0.2.2.6-do_not_install_files.patch b/kde-misc/qtrans/files/0.2.2.6-do_not_install_files.patch
new file mode 100644
index 000000000000..d3324c96c4e3
--- /dev/null
+++ b/kde-misc/qtrans/files/0.2.2.6-do_not_install_files.patch
@@ -0,0 +1,11 @@
+--- qtrans-0.2.2.6.old/CMakeLists.txt	2011-04-28 23:08:08.000000000 +0200
++++ qtrans-0.2.2.6/CMakeLists.txt	2011-04-28 23:12:47.000000000 +0200
+@@ -23,8 +23,3 @@
+ add_subdirectory(src)
+ add_subdirectory(flags)
+ add_subdirectory(icons)
+-
+-########### install files ###############
+-
+-INSTALL(FILES README DESTINATION  share/apps/qtrans/)
+-INSTALL(FILES ChangeLog DESTINATION  share/apps/qtrans/)
diff --git a/kde-misc/qtrans/qtrans-0.2.2.6.ebuild b/kde-misc/qtrans/qtrans-0.2.2.6.ebuild
index 98c6fba8aa08..e354b8750a37 100644
--- a/kde-misc/qtrans/qtrans-0.2.2.6.ebuild
+++ b/kde-misc/qtrans/qtrans-0.2.2.6.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/kde-misc/qtrans/qtrans-0.2.2.6.ebuild,v 1.2 2011/01/31 06:25:39 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/qtrans/qtrans-0.2.2.6.ebuild,v 1.3 2011/04/28 21:16:16 scarabeus Exp $
 
 EAPI=3
 WEBKIT_REQUIRED=always
@@ -17,7 +17,7 @@ IUSE="debug"
 
 DOCS=( ChangeLog README )
 
-src_install() {
-	kde4-base_src_install
-	rm -f "${ED}"usr/share/apps/qtrans/{ChangeLog,README}
-}
+PATCHES=(
+	"${FILESDIR}/${PV}-define_return.patch"
+	"${FILESDIR}/${PV}-do_not_install_files.patch"
+)