Update to eapi4. Fix wrong license wrt bug#414169. Remove overshadowed old version.

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

9 files changed, 35 insertions, 296 deletions

diff --git a/dev-util/codeblocks/ChangeLog b/dev-util/codeblocks/ChangeLog
index 63c6d2bccf75..25b142e70a13 100644
--- a/dev-util/codeblocks/ChangeLog
+++ b/dev-util/codeblocks/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/codeblocks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/ChangeLog,v 1.22 2012/04/23 22:19:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/ChangeLog,v 1.23 2012/04/30 20:27:26 scarabeus Exp $
+
+  30 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -codeblocks-1.0_pre20071215.ebuild, -files/8.02-version.patch,
+  -files/codeblocks-8.02-gcc43.patch, -files/codeblocks-8.02-gcc44.patch,
+  -files/codeblocks-8.02-gsocket.patch, codeblocks-10.05.ebuild,
+  codeblocks-9999.ebuild:
+  Update to eapi4. Fix wrong license wrt bug#414169. Remove overshadowed old
+  version.
 
   23 Apr 2012; Alexis Ballier <aballier@gentoo.org> codeblocks-10.05.ebuild:
   keyword ~x86-fbsd
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 76e8ac81706a..b38d64aeacba 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,21 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 8.02-version.patch 345 RMD160 4e871fb354dc3d68cac84c7791facbc1cd0c8ea9 SHA1 e89bfc45b1d831dcbc4fc5f18d2a8219daf66c55 SHA256 cd7d28a0ec35f8013103feacdc29b5a82f36f7af24793e764eb26fa998d45c8d
-AUX codeblocks-8.02-gcc43.patch 472 RMD160 558a7c577f78159fa82fe86b1af6502c4f62c2ac SHA1 7b5b5af288fc165f9b67aadf9d60f27315fb2b9f SHA256 7326f738027eebdb1a2037a4e5536f52c612e9ab6f82a4d738e295c3239ad293
-AUX codeblocks-8.02-gcc44.patch 4372 RMD160 db150c9fa9571f5da338b443a909fda4a8049f05 SHA1 fe55cb17fc0452875762e09cbf92347acdd9d453 SHA256 24ec7c52a63507191abf083a0d69f3a3766dbefbdf0dd352c190f8d9b9748f49
-AUX codeblocks-8.02-gsocket.patch 1261 RMD160 161f424a1ac01c48777ee5527e9603dc6c56c294 SHA1 b3378b9c6938c926048e4479eed982cc687c0383 SHA256 e188b1871a208667dfd3fa1df099d5e26d66cc5c82a1dd82e2f66e3ad3cee5f3
-DIST codeblocks-1.0_pre20071215.tar.bz2 11131352 RMD160 e8a43ff768512b79072c53d276cbe37badfe07bb SHA1 6760ad7b8688226f455a2bfb40d7e368273df5a2 SHA256 66f42142675ca80f5e50717aa9cb46ba2dc5bd8a1d4e8d1259514a64b9a67e9e
 DIST codeblocks-10.05-src.tar.bz2 7271651 RMD160 a1b4e93f4cc41ae6b7fd955689dae8648f0fd2f9 SHA1 b7697f512de69ad731f0febac4b91bb6c605fa57 SHA256 5143e2ffb3a6780ad3524046a32896bf5430276f3ba636d235c3d09774fa7fc2
-EBUILD codeblocks-1.0_pre20071215.ebuild 1293 RMD160 37c48b5aff4cba248c30bde2bec76f273e4035e5 SHA1 0b8dc999e8124166e01230188a767ada6928bdbf SHA256 5ce78e25596d7af29e584f68f4824127ca398589901389826cea2fc2c4040819
-EBUILD codeblocks-10.05.ebuild 1063 RMD160 d654ce867b82b9a997e8fd306e8430a1e73607dc SHA1 00cbc00a839131294b11e7d6e92ef9cde3d99637 SHA256 f7837b88f2df211920e02d38c411ec6d32efab3d9eb9d7354c11f7a2204634df
-EBUILD codeblocks-9999.ebuild 1527 RMD160 901da036b528fe290359fc705c499989baa16c6f SHA1 f8ca4dc69314055ead43c6392b176e080bef596f SHA256 756f24d0cee91e396521abd2bff44f4d1b75a082e9f0bbffc4b6d23602fb850e
-MISC ChangeLog 3850 RMD160 40df03d5219eefe3823f94318b826a3b9595a16c SHA1 ad01d68005df92ce4c2d32a650a56e1ba7a0dc29 SHA256 a4ea0cb856e63e49b052b25595a476f1e874e7a877faa623e69b8a4eebbba599
+EBUILD codeblocks-10.05.ebuild 991 RMD160 7a5cd6f2a3ac096df68fc5bbe3f9a9db9cd35e88 SHA1 24c305125aa508ca797552e4266b47a15f6e10de SHA256 3a4ea242477fcc118813cc8ff13def5d386bec64c437544a6b75f0268c2852ed
+EBUILD codeblocks-9999.ebuild 1393 RMD160 75a6cf479a6bdb6d4faeea1094d216495991bc38 SHA1 a2e90aae0765d3ec328c7e2c773f4b4ec38cb8f7 SHA256 94337e2714ca20081c92c8320d15e41d84e79580ec720746bdbf24e6b1d7a8bf
+MISC ChangeLog 4225 RMD160 746bb4f2ab85e89693206ff8e3615627139e8818 SHA1 001726e80b25c7ec74192af046374ba72557e595 SHA256 859ce47249f5cb413476c22fe802b5d245978fd10e5aedfb428011dc84dd77ec
 MISC metadata.xml 249 RMD160 e76a42314084b04beaf70ed8fb9d6da5969e8569 SHA1 b58d276517f70c4c92a430fa63225cc713f34640 SHA256 2e0861a2eda3e76f3c33f002d19f55b3d791ad704e4f2a8afaf82db9354aa44b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+V1WcACgkQvFcC4BYPU0q8NwCeIwq2uvK60SPqO2kJ2bpeG0Iw
-MVEAoLYw56k508s0XVjVbvh66wnqSl50
-=aMPs
+iQIcBAEBAgAGBQJPnvW0AAoJEOSiRoyO7jvoho4QAIypHtbRE1HUgf8XbolpgVx8
+4zqebSI8HtbheB5QdUjgOFSMpsMORaTZyOVvI7vkwUkSBvF0ou72OqajKcSIAnzL
+HW467xrBJwFYrrCDEGtwiv6u4YVsDxJIRWvjQltNNTAmzlJ0z2oi96cXhJQNaJAd
+AGGdmQLm9UyNeI+qlEyqsfwQ2l1Zthdtdrp40l9QrfDqOHgHhk4B30endZqZKTXO
+OR4R+ZuSNK3d+Dpk6VwcHgaIGGLM8Q7ydDNfJ9i8k6ZezAwRpnvUFqcxgq551yvJ
+w48VQzKhYnGk2hqMDe76DAP2LD5DeEjS6QbR6yo1v1LBSO9oiboxCaO4RqGZcMw3
+k0bGIQUugl7+Vvd4X+CyXZ7y4AFCGo434C6VyxCXXj6VhfSwdJlfLML4w7I5Gk8J
+LSfJ9x6jxSVifIb4/uSByXXTxbgh2U+j8YKQiQWIv2V7UFhkFLH9Sr+wmrJ/dphV
+HIOHbcSAns+pvnt0nLL777CQmXYE5Lmcm0eCqafFcVU8nxmmyeKyuo+DrO2Ey07C
+fYMabBSVX1zJJe+WSaK9OHJrv+C1uve3rpspnFgMJvtcqx9WSRqNeId/GSWE505Q
+CkjtlMNa2453CJAIwprjTetCfahC7WKh3rhdk4M9MvNPnu0XLfmKgicUVXbRbBYz
+4chAO+gsoi8K1aXJRwMD
+=IHMg
 -----END PGP SIGNATURE-----
diff --git a/dev-util/codeblocks/codeblocks-1.0_pre20071215.ebuild b/dev-util/codeblocks/codeblocks-1.0_pre20071215.ebuild
deleted file mode 100644
index c3a6eb1e6563..000000000000
--- a/dev-util/codeblocks/codeblocks-1.0_pre20071215.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-1.0_pre20071215.ebuild,v 1.3 2009/10/12 08:00:40 ssuominen Exp $
-
-WX_GTK_VER="2.8"
-inherit eutils wxwidgets
-
-DESCRIPTION="Code::Blocks - a free cross-platform C/C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="contrib debug"
-
-RDEPEND="=x11-libs/wxGTK-${WX_GTK_VER}*"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.5
-	>=sys-devel/automake-1.7
-	>=sys-devel/libtool-1.4
-	app-arch/zip"
-
-#pkg_setup() {
-#	if use unicode; then
-#		#check for gtk2-unicode
-#		need-wxwidgets unicode
-#	else
-#		#check for gtk2-ansi
-#		need-wxwidgets gtk2
-#	fi
-#}
-
-src_compile() {
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-
-	local TMP
-
-	TMP="/usr/share/aclocal/libtool.m4"
-	einfo "Running ./bootstrap"
-	if [ -e "$TMP" ]; then
-		cp "$TMP" aclocal.m4 || die "cp failed"
-	fi
-	./bootstrap || die "boostrap failed"
-
-	econf --with-wx-config="${WX_CONFIG}" \
-		$(use_enable contrib) \
-		$(use_enable debug) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-}
diff --git a/dev-util/codeblocks/codeblocks-10.05.ebuild b/dev-util/codeblocks/codeblocks-10.05.ebuild
index 59241aa997dd..3ad526ee4637 100644
--- a/dev-util/codeblocks/codeblocks-10.05.ebuild
+++ b/dev-util/codeblocks/codeblocks-10.05.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-10.05.ebuild,v 1.2 2012/04/23 22:19:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-10.05.ebuild,v 1.3 2012/04/30 20:27:26 scarabeus Exp $
 
-EAPI="2"
+EAPI="4"
 WX_GTK_VER="2.8"
 
 inherit wxwidgets flag-o-matic
 
 DESCRIPTION="The open source, cross platform, free C++ IDE."
 HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 SRC_URI="mirror://berlios/codeblocks/${P}-src.tar.bz2"
@@ -35,7 +35,3 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with contrib contrib-plugins all)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 1fe60616015b..2acc3770499f 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,8 +1,8 @@
-# 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/dev-util/codeblocks/codeblocks-9999.ebuild,v 1.2 2011/07/12 00:03:51 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-9999.ebuild,v 1.3 2012/04/30 20:27:26 scarabeus Exp $
 
-EAPI="2"
+EAPI="4"
 WX_GTK_VER="2.8"
 
 inherit autotools flag-o-matic subversion wxwidgets
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C++ IDE."
 HOMEPAGE="http://www.codeblocks.org/"
 ESVN_REPO_URI="svn://svn.berlios.de/${PN}/trunk"
 SRC_URI=""
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="contrib debug pch static-libs"
@@ -50,10 +50,6 @@ src_configure() {
 }
 
 src_compile() {
-	emake clean-zipfiles || die '"emake clean-zipfiles" failed'
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	emake clean-zipfiles
+	emake
 }
diff --git a/dev-util/codeblocks/files/8.02-version.patch b/dev-util/codeblocks/files/8.02-version.patch
deleted file mode 100644
index 83958ac5185e..000000000000
--- a/dev-util/codeblocks/files/8.02-version.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -ruN codeblocks-8.02.orig/revision.m4 codeblocks-8.02/revision.m4
---- codeblocks-8.02.orig/revision.m4	2008-03-02 00:49:23.000000000 +0300
-+++ codeblocks-8.02/revision.m4	2008-03-02 12:05:16.000000000 +0300
-@@ -1,3 +1,3 @@
- m4_define([SVN_REV], )
--m4_define([SVN_REVISION], 1.0svn)
-+m4_define([SVN_REVISION], 8.02)
- m4_define([SVN_DATE], )
diff --git a/dev-util/codeblocks/files/codeblocks-8.02-gcc43.patch b/dev-util/codeblocks/files/codeblocks-8.02-gcc43.patch
deleted file mode 100644
index dd3bbadf4dc5..000000000000
--- a/dev-util/codeblocks/files/codeblocks-8.02-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp codeblocks-8.02-orig/src/plugins/contrib/help_plugin/defs.h codeblocks-8.02/src/plugins/contrib/help_plugin/defs.h
---- codeblocks-8.02-orig/src/plugins/contrib/help_plugin/defs.h	2007-09-12 07:29:01.000000000 -0600
-+++ codeblocks-8.02/src/plugins/contrib/help_plugin/defs.h	2009-02-11 22:32:02.000000000 -0600
-@@ -13,6 +13,7 @@
- #include <ctime>
- #include <cctype>
- #include <cstdio>
-+#include <cstdlib>
- #include <string.h>
- 
- #define kDebug(x) DummyOutput()
diff --git a/dev-util/codeblocks/files/codeblocks-8.02-gcc44.patch b/dev-util/codeblocks/files/codeblocks-8.02-gcc44.patch
deleted file mode 100644
index 204c39e762ed..000000000000
--- a/dev-util/codeblocks/files/codeblocks-8.02-gcc44.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Naurp codeblocks-8.02-orig/src/src/prefix.cpp codeblocks-8.02/src/src/prefix.cpp
---- codeblocks-8.02-orig/src/src/prefix.cpp	2008-02-27 07:15:26.000000000 -0600
-+++ codeblocks-8.02/src/src/prefix.cpp	2009-07-29 17:05:52.797543317 -0600
-@@ -12,7 +12,7 @@
-  * Written by: Mike Hearn <mike@theoretic.com>
-  *             Hongli Lai <h.lai@chello.nl>
-  * http://autopackage.org/
-- * 
-+ *
-  * This source code is public domain. You can relicense this code
-  * under whatever license you want.
-  *
-@@ -202,21 +202,20 @@ br_locate_prefix (void *symbol)
- char *
- br_prepend_prefix (void *symbol, char *path)
- {
--	char *tmp, *newpath;
--
--	br_return_val_if_fail (symbol != NULL, (char*)NULL);
--	br_return_val_if_fail (path != NULL, (char*)NULL);
-+	br_return_val_if_fail (symbol != 0, (char*)0);
-+	br_return_val_if_fail (path != 0, (char*)0);
- 
--	tmp = br_locate_prefix (symbol);
--	if (!tmp) return (char*)NULL;
-+	char* tmp = br_locate_prefix (symbol);
-+	if (!tmp) return (char*)0;
- 
-+	char *newpath;
- 	if (strcmp (tmp, "/") == 0)
- 		newpath = strdup (path);
- 	else
- 		newpath = br_strcat (tmp, path);
- 
- 	/* Get rid of compiler warning ("br_prepend_prefix never used") */
--	if (0) br_prepend_prefix (NULL,  (char*)NULL);
-+	if (0) br_prepend_prefix (0,  (char*)0);
- 
- 	free (tmp);
- 	return newpath;
-@@ -240,9 +239,7 @@ static pthread_once_t br_thread_key_once
- static void
- br_thread_local_store_fini ()
- {
--	char *specific;
--
--	specific = (char *) pthread_getspecific (br_thread_key);
-+	char* specific = (char *) pthread_getspecific (br_thread_key);
- 	if (specific)
- 	{
- 		free (specific);
-@@ -301,11 +298,9 @@ const char *
- br_thread_local_store (char *str)
- {
- 	#if BR_PTHREADS
--		char *specific;
--
- 		pthread_once (&br_thread_key_once, br_thread_local_store_init);
- 
--		specific = (char *) pthread_getspecific (br_thread_key);
-+		char* specific = (char *) pthread_getspecific (br_thread_key);
- 		br_str_free (specific);
- 		pthread_setspecific (br_thread_key, str);
- 
-@@ -338,16 +333,13 @@ br_thread_local_store (char *str)
- char *
- br_strcat (const char *str1, const char *str2)
- {
--	char *result;
--	size_t len1, len2;
--
- 	if (!str1) str1 = "";
- 	if (!str2) str2 = "";
- 
--	len1 = strlen (str1);
--	len2 = strlen (str2);
-+	size_t len1 = strlen (str1);
-+	size_t len2 = strlen (str2);
- 
--	result = (char *) malloc (len1 + len2 + 1);
-+	char* result = (char *) malloc (len1 + len2 + 1);
- 	memcpy (result, str1, len1);
- 	memcpy (result + len1, str2, len2);
- 	result[len1 + len2] = '\0';
-@@ -360,16 +352,13 @@ br_strcat (const char *str1, const char 
- static char *
- br_strndup (char *str, size_t size)
- {
--	char *result = (char *) NULL;
--	size_t len;
-+	br_return_val_if_fail (str != (char *) 0, (char *) 0);
- 
--	br_return_val_if_fail (str != (char *) NULL, (char *) NULL);
--
--	len = strlen (str);
-+	size_t len = strlen (str);
- 	if (!len) return strdup ("");
- 	if (size > len) size = len;
- 
--	result = (char *) calloc (sizeof (char), len + 1);
-+	char* result = (char *) calloc (sizeof (char), len + 1);
- 	memcpy (result, str, size);
- 	return result;
- }
-@@ -389,16 +378,16 @@ br_strndup (char *str, size_t size)
- char *
- br_extract_dir (const char *path)
- {
--	char *end, *result;
--
--	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
-+	br_return_val_if_fail (path != (char *) 0, (char *) 0);
- 
--	end = strrchr (path, '/');
-+	const char* end = strrchr (path, '/');
- 	if (!end) return strdup (".");
- 
- 	while (end > path && *end == '/')
-+	{
- 		end--;
--	result = br_strndup ((char *) path, end - path + 1);
-+	}
-+	char* result = br_strndup ((char *) path, end - path + 1);
- 	if (!*result)
- 	{
- 		free (result);
-@@ -424,15 +413,13 @@ br_extract_dir (const char *path)
- char *
- br_extract_prefix (const char *path)
- {
--	char *end, *tmp, *result;
--
--	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
-+	br_return_val_if_fail (path != (char *) 0, (char *) 0);
- 
- 	if (!*path) return strdup ("/");
--	end = strrchr (path, '/');
-+	const char* end = strrchr (path, '/');
- 	if (!end) return strdup (path);
- 
--	tmp = br_strndup ((char *) path, end - path);
-+	char* tmp = br_strndup ((char *) path, end - path);
- 	if (!*tmp)
- 	{
- 		free (tmp);
-@@ -441,7 +428,7 @@ br_extract_prefix (const char *path)
- 	end = strrchr (tmp, '/');
- 	if (!end) return tmp;
- 
--	result = br_strndup (tmp, end - tmp);
-+	char* result = br_strndup (tmp, end - tmp);
- 	free (tmp);
- 
- 	if (!*result)
diff --git a/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch b/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch
deleted file mode 100644
index 57072e5168f7..000000000000
--- a/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/307603
-http://svn.berlios.de/wsvn/codeblocks/?op=comp&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5713&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5716
-
---- a/src/plugins/contrib/codesnippets/codesnippets.cpp
-+++ b/src/plugins/contrib/codesnippets/codesnippets.cpp
-@@ -52,8 +52,12 @@
- #include "memorymappedfile.h"
- 

- #if defined(__WXGTK__)

-+	 // hack to avoid name-conflict between wxWidgets GSocket and the one defined
-+	// in newer glib-headers
-+	#define GSocket GLibSocket
-+	#include <gdk/gdkx.h>
-+	#undef GSocket
-     #include "wx/gtk/win_gtk.h"

--    #include <gdk/gdkx.h>

- #endif

- 

- // The plugin needs a flag ON to enable some code for the plugin

---- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
-+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
-@@ -49,8 +49,12 @@
- #include "menuidentifiers.h"

- #include "editsnippetframe.h"

- #if defined(__WXGTK__)
-+	 // hack to avoid name-conflict between wxWidgets GSocket and the one defined
-+	// in newer glib-headers
-+	#define GSocket GLibSocket
-+	#include <gdk/gdkx.h>
-+	#undef GSocket
-     #include "wx/gtk/win_gtk.h"

--    #include <gdk/gdkx.h>

- #endif

- 
- IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)