[gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/

[Mart Raudsepp]

commit:     8a11bf42abe8a4c21620f3f5f2c60fb8c4b8bd30
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Jan 11 13:10:02 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 10:09:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a11bf42

dev-util/codeblocks: update live-ebuild with switch to WXGTK-3.0-gtk3

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 dev-util/codeblocks/codeblocks-9999.ebuild | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 1763fdfc078..5350bd29d7c 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 
-inherit autotools gnome2-utils subversion wxwidgets xdg-utils
+inherit autotools subversion wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/"
@@ -14,10 +14,15 @@ SLOT="0"
 KEYWORDS=""
 SRC_URI=""
 ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
+ESVN_FETCH_CMD="svn checkout --ignore-externals"
 
 IUSE="contrib debug pch"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0/3.1
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	contrib? (
 		app-admin/gamin
@@ -25,10 +30,7 @@ RDEPEND="app-arch/zip
 		dev-libs/boost:=
 	)"
 
-DEPEND="${RDEPEND}
-	>=dev-libs/tinyxml-2.6.2-r3
-	>=dev-util/astyle-3.1-r2:0/3.1
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff )
 
@@ -53,18 +55,16 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
+	elog "The Symbols Browser is disabled due to it causing crashes."
+	elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
 
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }