app-text/searchmonkey: Fix for gcc-4.7, #423191

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

5 files changed, 75 insertions, 16 deletions

diff --git a/app-text/searchmonkey/ChangeLog b/app-text/searchmonkey/ChangeLog
index a29f2e28631d..a1da69c9a00e 100644
--- a/app-text/searchmonkey/ChangeLog
+++ b/app-text/searchmonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/searchmonkey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/ChangeLog,v 1.8 2012/05/04 03:33:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/ChangeLog,v 1.9 2012/06/25 17:18:36 jlec Exp $
+
+  25 Jun 2012; Justin Lecher <jlec@gentoo.org> searchmonkey-2.0.0.ebuild,
+  +files/searchmonkey-2.0.0-gcc4.7.patch, metadata.xml:
+  Fix for gcc-4.7, #423191
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> searchmonkey-0.8.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-text/searchmonkey/Manifest b/app-text/searchmonkey/Manifest
index 76113924a5b5..e7fc69346c34 100644
--- a/app-text/searchmonkey/Manifest
+++ b/app-text/searchmonkey/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX searchmonkey-2.0.0-gcc4.7.patch 1342 RMD160 dda459057cfb7161a5ece8a033c7caee76a30a12 SHA1 8aa70921287faf1be96aee7d027699962093e2a9 SHA256 8ac09a7985a7085fbea5b4c117e7ae62d375fee06f2457080dbfc924a4cc4900
 AUX searchmonkey-2.0.0.desktop 181 RMD160 24697782bc40b9430d1893f2b473d302437fea17 SHA1 985ad10b7a9c98f3d942028e8d155d74b6dd0545 SHA256 e97a27492a75ea09b7f14caeecb3c75217a06c91fb8fc93248ef294ffdd9925f
 DIST searchmonkey-0.8.1.tar.gz 364824 RMD160 b22a6cde49a9ab7a7a48e4be43e76a654b585ad8 SHA1 a0ccfacd0a1710a0b53c4855ee0a6de9a4af16aa SHA256 5b20484deeb0b4134fa3848d9db631637ec62ed9eac337863b118f617558caca
 DIST searchmonkey_v2.0.0.zip 491726 RMD160 3cc8acfb125f0b22e8563f8181e5ef9c3471db21 SHA1 985a04b99cdc4d29483ffa0f676539e560628c1d SHA256 116ebe50c8daff6fa3366ca19087ac1c7d6a40e0c39b9e3c0f4cb6ed66ee87b1
 EBUILD searchmonkey-0.8.1.ebuild 718 RMD160 8e6d1cfaa32a3bad86329284cddfe3828775c172 SHA1 7b0f8bcdca5b93b021a200e210c33faf29d76da3 SHA256 363a8bf2b75cbe81d007397da2b0588deb087c0af2becb388a2625b9ff976164
-EBUILD searchmonkey-2.0.0.ebuild 874 RMD160 6626d44e6ccd051fd1acbf42dcc9b5322f5ae593 SHA1 ba7d7571558b0be2af46243ee9a77c20311011b8 SHA256 18e7facd83659940268ff6c8bba6e9a4f1a0f94658e8af294b62aa47774d4fe2
-MISC ChangeLog 1306 RMD160 787e71e463f3c36acedfa38fecb3fd8069246ceb SHA1 e6adcef9c04ad2c13315070c5d2b669ddd291621 SHA256 411bf5581c4c5383748fd9ae814da417ce88d35d9082e004139fc00ad869723d
-MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
+EBUILD searchmonkey-2.0.0.ebuild 870 RMD160 2e410aac1e7fb0c4ab5c15a18da4ff1dd433d1be SHA1 eba2a4510745736df095fd5731eaccebb7d2e3e6 SHA256 c3908125137d31ba9873494ced2a4d09eaae3bba1304b587b2173bac88ed3239
+MISC ChangeLog 1462 RMD160 966be612e3e061d566207f40df342a6cea052b76 SHA1 fa67538f83ff60e8e0236cf11fdcec28b95edc38 SHA256 d8fe5be63e5e3147a090fbafd8f344ee09130b6c79131315c6c2e193eee52a9e
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/onXIACgkQgAnW8HDreRZkrACgw8mrFQgVDkql4ariyoiVQB5M
+bjcAoMQw5NYNNERAMGUqg4NXksBSnmqR
+=Mihd
+-----END PGP SIGNATURE-----
diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch
new file mode 100644
index 000000000000..f9d1718dd7b4
--- /dev/null
+++ b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch
@@ -0,0 +1,40 @@
+ Utility.h |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Utility.h b/Utility.h
+index 890eada..99f9a4e 100644
+--- a/Utility.h
++++ b/Utility.h
+@@ -92,16 +92,6 @@ QRegExp::PatternSyntax uint2syntax(uint _index);
+     CallEach(observers, searchable, &Subject::Register);

+     here the Subject is the type of Caller

+ */

+-template <typename CalleeContainer, typename Caller, typename Op>

+-void CallEach(const CalleeContainer& container, Caller& caller, Op op)

+-{

+-    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));

+-}

+-template <typename T>

+-bool IsValueInRange(T value, T lowerBound, T upperBound)

+-{

+-    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);

+-}

+ template <typename T>

+ bool BoundSpecified(T boundValue)

+ {

+@@ -129,5 +119,15 @@ bool UpperBoundFit(T value, T upperBound)
+ 

+     return false;

+ }

++template <typename CalleeContainer, typename Caller, typename Op>

++void CallEach(const CalleeContainer& container, Caller& caller, Op op)

++{

++    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));

++}

++template <typename T>

++bool IsValueInRange(T value, T lowerBound, T upperBound)

++{

++    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);

++}

+ 

+ #endif

diff --git a/app-text/searchmonkey/metadata.xml b/app-text/searchmonkey/metadata.xml
index ff62877c67ae..91f4e72fb544 100644
--- a/app-text/searchmonkey/metadata.xml
+++ b/app-text/searchmonkey/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
index 772951fa0eb7..61bd70409077 100644
--- a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
+++ b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/searchmonkey-2.0.0.ebuild,v 1.1 2011/09/02 23:34:43 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/searchmonkey-2.0.0.ebuild,v 1.2 2012/06/25 17:18:36 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit qt4-r2
 
 MY_PN=${PN}2
 MY_P=${PN}_v${PV}
+
 DESCRIPTION="Powerful text searches using regular expressions"
 HOMEPAGE="http://searchmonkey.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${MY_PN^}/${PV}%20%5Bstable%5D/${MY_P}.zip"
@@ -17,19 +18,21 @@ SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/qt-gui
-	x11-libs/qt-core"
+RDEPEND="
+	x11-libs/qt-core
+	x11-libs/qt-gui"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-gcc4.7.patch )
+
 src_install() {
-	newbin ${PN} ${MY_PN} || die
+	newbin ${PN} ${MY_PN}
 
 	# Hand-made desktop icon
-	insinto /usr/share/pixmaps/
-	doins pixmaps/searchmonkey-300x300.png || die
+	doicon pixmaps/searchmonkey-300x300.png
 	insinto /usr/share/applications/
-	doins "${FILESDIR}"/${P}.desktop || die
+	doins "${FILESDIR}"/${P}.desktop
 }