Make it gcc46 resistant, #369887

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

5 files changed, 46 insertions, 25 deletions

diff --git a/dev-util/piklab/ChangeLog b/dev-util/piklab/ChangeLog
index 86e55b80fa89..e97b22e7c7d3 100644
--- a/dev-util/piklab/ChangeLog
+++ b/dev-util/piklab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/piklab
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/ChangeLog,v 1.2 2010/10/07 21:34:04 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/ChangeLog,v 1.3 2011/06/03 15:02:45 jlec Exp $
+
+  03 Jun 2011; Justin Lecher <jlec@gentoo.org> piklab-0.15.7.ebuild,
+  piklab-0.15.10.ebuild, +files/piklab-0.15.10-gcc46.patch:
+  Make it gcc46 resistant, #369887
 
 *piklab-0.15.10 (07 Oct 2010)
 
diff --git a/dev-util/piklab/Manifest b/dev-util/piklab/Manifest
index 1648fdd21d0f..d4e4c119fa59 100644
--- a/dev-util/piklab/Manifest
+++ b/dev-util/piklab/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX piklab-0.15.10-gcc46.patch 793 RMD160 356b25e85491a958152f6b142710dcbb579ea70e SHA1 fc0bc78ce4609f0a3a0d2b8c77aff7544a2fd9ba SHA256 62c25b7437ad2aaa8c55cf7462ffc58b0d6fe4375e901084bf8001e8938d46ff
 DIST piklab-0.15.10.tar.bz2 929956 RMD160 e1a465f7cc5053184ee9a17310b0b1dc0bc832e4 SHA1 34fe65e941f6e04a93fe38f2e8a69e7a9c263d12 SHA256 9ae1fc44bdd8eb99d67d74507a55b8115579791bc36235fa4a93748bbd18b418
 DIST piklab-0.15.7.tar.bz2 1468034 RMD160 6a690562f341249e1723ee9e8ba5c30cc6897b93 SHA1 e2623feaf75fd3fe88529d2131b016aea328dc9d SHA256 e819c2462424e09fdd28106439f786a7b171218eb5d2d66ab5b1ba12ab31fa59
-EBUILD piklab-0.15.10.ebuild 769 RMD160 ed9a4f5024b7e14f0d0b9ba752d55f434ada2966 SHA1 5861ff1cfba3e5616474436b5962889f17967fc8 SHA256 d037bb32cd8e6ca012a0fc06b0bf791f3cd3afbda33aaeb2fa90764efca899a8
-EBUILD piklab-0.15.7.ebuild 855 RMD160 d128cbd6fab2ae33bedf3fdc1c31b93450095c2b SHA1 ac7782be7e092875d027b952d4948ecb34914f98 SHA256 ca9d1106441904ab0653b634b0091cbce5b61caa7056df4a41011871f1c56d13
-MISC ChangeLog 491 RMD160 300a61a731c5131870f5a4446517c501e18283b9 SHA1 c50436133680802d6cecaf8b0ba6f8be82060d6e SHA256 9ef4dd238d0a38b5ea568c29ff188708fedcb395b97e76602cca8a8208a7c8a4
+EBUILD piklab-0.15.10.ebuild 796 RMD160 cf2886be453604eff54cf0167b17f6a27d09839a SHA1 06e6e0ac39fce1ccd42d96afc38bfff77984b4bd SHA256 86be5719a3944b592e299fdee6d5933e3367112281d613c0a9471cff09b5ff71
+EBUILD piklab-0.15.7.ebuild 843 RMD160 e81270236d43e7d47d7469f794cea2c82dec7eaf SHA1 63b9c95e353c7c105a06d17dd5e14ab8ac57a6a3 SHA256 3c3ec53ee1ede914d234a971a3977599eba8747ff932f736c65b817e304ce5b5
+MISC ChangeLog 654 RMD160 67d2362db95bf2e371e685fe66c3a4df02ee4f4c SHA1 6836e3825b15d670cef2674cf0630dad326f9754 SHA256 163838c2aaed07b573fc398aabb7d8743b9c07f53ca4b482ccf7e6d76b2bf540
 MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkyuPHQACgkQTwhj9JtAlp5W7wD7BTmDH62U9BLbVrvfUpaQs4Hj
-XDi7IT+Wb2Z3Dlyp6ugA/3gm1iyhTdFAwvSacswn8cwYHif6sy59qoSg5WQP+E9e
-=V2GB
+iEYEARECAAYFAk3o95sACgkQgAnW8HDreRYLcwCfac8pnSZlxf6F7BfOwzcryPOw
+bvMAn3kjFF4qwbYii9jAV0yPJRX7321p
+=Y0RB
 -----END PGP SIGNATURE-----
diff --git a/dev-util/piklab/files/piklab-0.15.10-gcc46.patch b/dev-util/piklab/files/piklab-0.15.10-gcc46.patch
new file mode 100644
index 000000000000..e53b594db423
--- /dev/null
+++ b/dev-util/piklab/files/piklab-0.15.10-gcc46.patch
@@ -0,0 +1,12 @@
+diff -ur piklab-0.15.10/src/xml_to_data/device_xml_to_data.h piklab-0.15.10-gcc46/src/xml_to_data/device_xml_to_data.h
+--- piklab-0.15.10/src/xml_to_data/device_xml_to_data.h	2010-07-05 18:16:57.000000000 +0200
++++ piklab-0.15.10-gcc46/src/xml_to_data/device_xml_to_data.h	2011-01-31 17:03:42.000000000 +0100
+@@ -61,7 +61,7 @@
+     ts << "const char *" << namespaceName() << "::DATA_STREAM =" << endl;
+     QValueList<DataType *> list;
+     for (QMap<QString, Data *>::const_iterator it=_map.begin(); it!=_map.end(); ++it)
+-      list.append(static_cast<const DataType *>(it.data()));
++      list.append(static_cast<DataType *>(it.data()));
+     uint size = toCppString(list, ts);
+     ts << ";" << endl;
+     ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl;
diff --git a/dev-util/piklab/piklab-0.15.10.ebuild b/dev-util/piklab/piklab-0.15.10.ebuild
index 9467fc3f7ea8..a0ee0a3599a7 100644
--- a/dev-util/piklab/piklab-0.15.10.ebuild
+++ b/dev-util/piklab/piklab-0.15.10.ebuild
@@ -1,32 +1,35 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.10.ebuild,v 1.1 2010/10/07 21:34:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.10.ebuild,v 1.2 2011/06/03 15:02:45 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit qt4-r2 cmake-utils
 
-DESCRIPTION="command-line programmer and debugger for PIC and dsPIC microcontrollers"
+DESCRIPTION="CLI programmer and debugger for PIC and dsPIC microcontrollers"
 HOMEPAGE="http://piklab.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz -> ${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/qt-gui:4
+RDEPEND="
+	x11-libs/qt-gui:4
 	x11-libs/qt-qt3support:4
-	virtual/libusb:0
 	sys-libs/ncurses
-	sys-libs/readline"
+	sys-libs/readline
+	virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
 MYCMAKEARGS="-DQT_ONLY=1"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc46.patch )
+
 src_prepare() {
 	sed -i \
 		-e "/\<share.doc.piklab\>/s:/piklab:/${PF}:" \
 		CMakeLists.txt
-	default
+	base_src_prepare
 }
diff --git a/dev-util/piklab/piklab-0.15.7.ebuild b/dev-util/piklab/piklab-0.15.7.ebuild
index c4fde02c6ae9..ad4599a6a92c 100644
--- a/dev-util/piklab/piklab-0.15.7.ebuild
+++ b/dev-util/piklab/piklab-0.15.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.7.ebuild,v 1.3 2010/09/22 18:36:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/piklab/piklab-0.15.7.ebuild,v 1.4 2011/06/03 15:02:45 jlec Exp $
 
 EAPI=2
 inherit qt4-r2
 
-DESCRIPTION="command-line programmer and debugger for PIC and dsPIC microcontrollers"
+DESCRIPTION="CLI programmer and debugger for PIC and dsPIC microcontrollers"
 HOMEPAGE="http://piklab.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/qt-gui:4
+RDEPEND="
+	x11-libs/qt-gui:4
 	x11-libs/qt-qt3support:4
-	virtual/libusb:0
 	sys-libs/ncurses
-	sys-libs/readline"
+	sys-libs/readline
+	virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"