Version bump (bug #456826 by Sorath). Sync live ebuild, remove old.

(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

3 files changed, 42 insertions, 31 deletions

diff --git a/dev-util/codeblocks/ChangeLog b/dev-util/codeblocks/ChangeLog
index 0fb606a21ff9..42074cd6b03c 100644
--- a/dev-util/codeblocks/ChangeLog
+++ b/dev-util/codeblocks/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2012/11/02 06:03:31 dirtyepic Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/ChangeLog,v 1.25 2013/03/04 04:57:48 dirtyepic Exp $
+
+*codeblocks-12.11 (04 Mar 2013)
+
+  04 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> -codeblocks-10.05.ebuild,
+  +codeblocks-12.11.ebuild, codeblocks-9999.ebuild:
+  Version bump (bug #456826 by Sorath). Sync live ebuild, remove old.
 
 *codeblocks-10.05-r1 (02 Nov 2012)
 
diff --git a/dev-util/codeblocks/codeblocks-10.05.ebuild b/dev-util/codeblocks/codeblocks-12.11.ebuild
index 3ad526ee4637..7d8bbcc2d516 100644
--- a/dev-util/codeblocks/codeblocks-10.05.ebuild
+++ b/dev-util/codeblocks/codeblocks-12.11.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.3 2012/04/30 20:27:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-12.11.ebuild,v 1.1 2013/03/04 04:57:48 dirtyepic Exp $
 
-EAPI="4"
+EAPI="5"
 WX_GTK_VER="2.8"
 
-inherit wxwidgets flag-o-matic
+inherit eutils wxwidgets
 
 DESCRIPTION="The open source, cross platform, free C++ IDE."
 HOMEPAGE="http://www.codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://berlios/codeblocks/${P}-src.tar.bz2"
+SRC_URI="mirror://berlios/codeblocks/${P/-/_}-1.tar.gz"
 
 IUSE="contrib debug pch static-libs"
 
-RDEPEND="x11-libs/wxGTK:2.8[X]"
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:2.8[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost
+		dev-libs/libgamin
+	)"
 DEPEND="${RDEPEND}
-	app-arch/zip"
+	virtual/pkgconfig"
 
-S=${WORKDIR}/${P}-release
+S="${WORKDIR}/${P}release8629"
 
 src_configure() {
-	# C::B is picky on CXXFLAG -fomit-frame-pointer
-	# (project-wizard crash, instability ...)
-	filter-flags -fomit-frame-pointer
-	append-flags -fno-strict-aliasing
-
 	econf \
 		--with-wx-config="${WX_CONFIG}" \
 		$(use_enable debug) \
@@ -35,3 +36,8 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with contrib contrib-plugins all)
 }
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 6cbd9d46c7f0..c76598aa7a1e 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.4 2012/11/02 06:03:31 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/codeblocks/codeblocks-9999.ebuild,v 1.5 2013/03/04 04:57:48 dirtyepic Exp $
 
-EAPI="4"
+EAPI="5"
 WX_GTK_VER="2.8"
 
-inherit autotools eutils flag-o-matic subversion wxwidgets
+inherit autotools eutils subversion wxwidgets
 
 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-3"
 SLOT="0"
 KEYWORDS=""
+SRC_URI=""
+ESVN_REPO_URI="svn://svn.berlios.de/${PN}/trunk"
+
 IUSE="contrib debug pch static-libs"
 
-RDEPEND="x11-libs/wxGTK:2.8[X]"
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:2.8[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost
+		dev-libs/libgamin
+	)"
 DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-libs/libgamin
-	sys-devel/libtool:2
 	virtual/pkgconfig"
 
-src_unpack(){
+src_unpack() {
 	subversion_src_unpack
 }
 
@@ -37,11 +41,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# C::B is picky on CXXFLAG -fomit-frame-pointer
-	# (project-wizard crash, instability ...)
-	filter-flags -fomit-frame-pointer
-	append-flags -fno-strict-aliasing
-
 	econf \
 		--with-wx-config="${WX_CONFIG}" \
 		$(use_enable debug) \