gentoo resync : 14.07.2018

5 files changed, 199 insertions, 18 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c164dc051a6e..5fcbe0b775c9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 187f5c15dce4..bc5436400172 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,7 +1,10 @@
 AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
+DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
+EBUILD codeblocks-17.12-r1.ebuild 2168 BLAKE2B 09145374c37590aee4838ea1255d1c83b123bc9d230e5f666c76e71622fa5041ca88ace4fcf651f717402b12d5447572045651d6b765d6b683e2cb2e2ad33ea4 SHA512 40a006c43b9dc309961b19769802114f5c8e46efe3e0e956a0c6ab7231b5700cfdf9e9cd43af46d0f9f9a7c57663cf3df4df682c9588da084d594d3ea33e7060
 EBUILD codeblocks-17.12-r300.ebuild 2014 BLAKE2B 6b99be334575d995d4537c192b90785c3628a6ee0c377957519d200ae7a931bea5e0ebd2cabed7d0fde9808bea95795d0fbd85c3417999197800db57c70be329 SHA512 a6bcd96a13095c3e31357d94cdd76fba0f7161120261750edbffd81b243b9323f089bb91a4929f317e79fde85c7579ef72fe5dcbd241a0cc7eef6dd385599b83
+EBUILD codeblocks-17.12-r301.ebuild 2173 BLAKE2B d4626ed172b0205e9d6efcb256eebc8d7e148346762ca206ad1b6cceef19e819a6c3849b40541915415ab2e96c0283ef75e092c3839b25535cac2501bbcc9a92 SHA512 e476b514275ed881bff370c342acd47ec9f612ed84fb0d796cd983b441a0b72ff772415495e35d660fcdeca56e39dae65753fefbce2a85ed2679a28c5ac05070
 EBUILD codeblocks-17.12.ebuild 2009 BLAKE2B a2266b73e5b75e95173240f01929146cb81d9313c570589899142c4631660bf214384fdbb73522bca1bf33d7a40cc0217eb5beb78d1b1998bf2e483ace970bdb SHA512 43d790abbd465566cf5aa18ca86133e7835c51643a570d23b43ac8df74e74a764079077e1e40c1a7b5d30c19d28cf4f9377f6b689f5618bac4e9e8539b57d132
-EBUILD codeblocks-9999.ebuild 1249 BLAKE2B 143412cd2c6b0652612cbb89e0385803ccadfd34fda6df4a0bbf8a4628f5dfedc5480f890b57e814778768cfe7b728fddd0e8119086c61b0a1b5b6433cd5d053 SHA512 f2d31b7ef1d77d92d388c9a2c89114d14cc0c5bd7e1e29f120cf9ad12bd43d14d04adacd0f63e0bdc340c2b229477a41f43cd36f0e489a8e85a1f0601338808d
+EBUILD codeblocks-9999.ebuild 1632 BLAKE2B 7b595b20cb9bb49870c01ced1e8b5602ceaedcf4e4461bf9a1fcacc8d9a270e49f84c7bf28b735ac6304852a2576e58d70a129c55a1fc5cb626db969c278c91f SHA512 a4e0032db0edd1a4da5d370d60f733aa79624dba2c4fcf3742e1d898b05cf5d70f467f2d7e24337daa0e8427a4814a1859f9349fec42ca9d2cb4c6883e5a85a2
 MISC metadata.xml 673 BLAKE2B 2868f0b98e33bfa54b217038a440d01d7f289093a6d31873b33f9eb3570c9f83c57476d2aaeabfbbdc180ec00fbdb300ec68cbb45ee95ddf99b3ddf7e92681f6 SHA512 54996828105be8435499880af88e1bb48eb746787f4838e691ddf740c86c3ca84a09973a9925ff160308ba1a28a5e746f58d2d1b646f922a2949368dc3a016fc
diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
new file mode 100644
index 000000000000..33bc6b02fc6b
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-admin/gamin
+		app-text/hunspell
+		dev-libs/boost:=
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.0.1-r1:0=
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${WORKDIR}"/patches/
+	)
+
+src_prepare() {
+	default
+	if has_version ">=dev-util/astyle-3.1" ; then
+		epatch "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+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
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
new file mode 100644
index 000000000000..faf2dc26b2cf
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-admin/gamin
+		app-text/hunspell
+		dev-libs/boost:=
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.0.1-r1:0=
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${WORKDIR}"/patches/
+	)
+
+src_prepare() {
+	default
+	if has_version ">=dev-util/astyle-3.1" ; then
+		epatch "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+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
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 9296cc13443b..1763fdfc0789 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
+
 WX_GTK_VER="3.0"
 
-inherit autotools eutils subversion wxwidgets
+inherit autotools gnome2-utils subversion wxwidgets xdg-utils
 
-DESCRIPTION="The open source, cross platform, free C++ IDE"
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
@@ -14,23 +15,25 @@ KEYWORDS=""
 SRC_URI=""
 ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
 
-IUSE="contrib debug pch static-libs"
+IUSE="contrib debug pch"
 
 RDEPEND="app-arch/zip
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	contrib? (
+		app-admin/gamin
 		app-text/hunspell
 		dev-libs/boost:=
-		dev-libs/libgamin
 	)"
+
 DEPEND="${RDEPEND}
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0/3.1
 	virtual/pkgconfig"
 
-src_unpack() {
-	subversion_src_unpack
-}
+PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff )
 
 src_prepare() {
+	default
 	# Let's make the autorevision work.
 	subversion_wc_info
 	CB_LCD=$(LC_ALL=C svn info "${ESVN_WC_PATH}" | grep "^Last Changed Date:" | cut -d" " -f4,5)
@@ -40,21 +43,28 @@ src_prepare() {
 }
 
 src_configure() {
-	need-wxwidgets unicode
+	setup-wxwidgets
+
 	econf \
-		--with-wx-config="${WX_CONFIG}" \
+		--disable-static \
 		$(use_enable debug) \
 		$(use_enable pch) \
-		$(use_enable static-libs static) \
 		$(use_with contrib contrib-plugins all)
 }
 
-src_compile() {
-	emake clean-zipfiles
-	emake
+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
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
 
-src_install() {
-	default
-	prune_libtool_files
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }