diff options
Diffstat (limited to 'dev-util/codeblocks')
-rw-r--r-- | dev-util/codeblocks/Manifest | 5 | ||||
-rw-r--r-- | dev-util/codeblocks/codeblocks-17.12-r302.ebuild (renamed from dev-util/codeblocks/codeblocks-17.12-r1.ebuild) | 29 | ||||
-rw-r--r-- | dev-util/codeblocks/codeblocks-17.12.ebuild | 80 | ||||
-rw-r--r-- | dev-util/codeblocks/codeblocks-9999.ebuild | 28 |
4 files changed, 30 insertions, 112 deletions
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest index e90434fde403..e5a5f75e711f 100644 --- a/dev-util/codeblocks/Manifest +++ b/dev-util/codeblocks/Manifest @@ -2,9 +2,8 @@ AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6 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 2158 BLAKE2B 7a7aa1b17655b4727a1a105dc4c13c2bab3332ce0db027d5417f214f608976e1c17ced1d5374c1055e1ffceb8700f92d2444ee8317c5c34be3324947e815dfb7 SHA512 a71101d41db629227d75a12c9e6802c8329e7c895e14ce3e0c5aac3b780cf2eabd12a1209b7fa3fb424f600c8812bb50c622aa478a27aedc2a4049b58f6549c3 EBUILD codeblocks-17.12-r300.ebuild 2004 BLAKE2B 6b6b47b35498949282efa068e70c235fa52611580f69d26cdcd483e8fe3c15093921152dd7c2d70a506491efedb1886b44282cbdad8594343c529e1273062029 SHA512 b10b5befad57a1bfc68a27af1eb326a2091600648bb53fb266ac271511ec04bd8005c47a097ba89f486c7f5f260e9e7d38074cb7f3ec9edbad22666ed94ba5b7 EBUILD codeblocks-17.12-r301.ebuild 2158 BLAKE2B 88352118a259383659f4c9f2cfd820db719fc375a7615f69e5c5f1f5dd870057dde05c8c91908d0ecb2b87a60ce4e850d6bb79336ffca859d528d7c73f74526c SHA512 13336eac42465cb51e05fa81c1732408d429a758032c86909130980b1684304926fd3fd8860b17c9c9fca3c26481279350d77a9bb8c8aac0d68eb42342e36270 -EBUILD codeblocks-17.12.ebuild 1999 BLAKE2B dc09e29a6d21d530388de93ee093ae50da7406a45fba83a021be19f3fbe7ef587bf039b7a9f380d8edf7ff0ffbd4fc3ab09117837978de687bd7b34476478cc7 SHA512 d331f33150e3054fed50b18c78e105fa76e73022a220a8cabd651e63e076fceff80ef1d3997d112f327f8252b1088f3cb3f5c7240d8609dbcc028f9c83c5cacd -EBUILD codeblocks-9999.ebuild 1632 BLAKE2B 7b595b20cb9bb49870c01ced1e8b5602ceaedcf4e4461bf9a1fcacc8d9a270e49f84c7bf28b735ac6304852a2576e58d70a129c55a1fc5cb626db969c278c91f SHA512 a4e0032db0edd1a4da5d370d60f733aa79624dba2c4fcf3742e1d898b05cf5d70f467f2d7e24337daa0e8427a4814a1859f9349fec42ca9d2cb4c6883e5a85a2 +EBUILD codeblocks-17.12-r302.ebuild 2075 BLAKE2B 268d201e8c4d8327c25031ca436617b15f25dd66d75b19a2b0e7e835c1cddf41944425629909d5307a68b128661cae9773e4af8835dac98fc211bb301cd5ee69 SHA512 9cb65efb26c46b96b9b8f4b48d9947c329380634d47650f6fad5b206b3574272bc720adc4a7ffb83cdc26bc2f65328b716fe9542e8cd4e5578cdc625e361f2c1 +EBUILD codeblocks-9999.ebuild 1598 BLAKE2B f2780d052fd517a2363e2d0866ed381a8eadb81d425f9337384ef4af69bf36855da1642e3628a47884c41ef35451a7f7d21ea8987b80030b73836df30384d829 SHA512 0d0b54fc9e42534c3d55a30a06b105597f1baef9613dd7df1ba23d0ace30ee4000994916b3bf2789ba10a527376e89b1184840c709f720b2a0d1033441312c24 MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735 diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild index 07ab74227eac..e7e1bf808573 100644 --- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild +++ b/dev-util/codeblocks/codeblocks-17.12-r302.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 wxwidgets xdg-utils +inherit autotools wxwidgets xdg-utils DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" HOMEPAGE="http://www.codeblocks.org/" @@ -23,7 +23,11 @@ https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.x IUSE="contrib debug fortran pch" +BDEPEND="virtual/pkgconfig" + RDEPEND="app-arch/zip + >=dev-libs/tinyxml-2.6.2-r3 + >=dev-util/astyle-3.0.1-r1:0= x11-libs/wxGTK:${WX_GTK_VER}[X] contrib? ( app-admin/gamin @@ -31,10 +35,7 @@ RDEPEND="app-arch/zip dev-libs/boost:= )" -DEPEND="${RDEPEND} - >=dev-libs/tinyxml-2.6.2-r3 - >=dev-util/astyle-3.0.1-r1:0= - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff @@ -44,7 +45,7 @@ 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 + eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch fi eautoreconf } @@ -67,18 +68,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 } diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild deleted file mode 100644 index c83617929435..000000000000 --- a/dev-util/codeblocks/codeblocks-17.12.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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 flag-o-matic gnome2-utils wxwidgets xdg-utils - -DESCRIPTION="The open source, cross platform, free C++ IDE" -HOMEPAGE="http://www.codeblocks.org/" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.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-text/hunspell - dev-libs/boost:= - dev-libs/libgamin - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/codeblocks-17.12-nodebug.diff - "${WORKDIR}"/patches/ -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - setup-wxwidgets - - append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) - - # 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 \ - --with-wx-config="${WX_CONFIG}" \ - --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 1763fdfc0789..5350bd29d7cc 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 } |