Skip to content

Commit

Permalink
dev-util/codeblocks: unbundle dev-util/astyle lib
Browse files Browse the repository at this point in the history
Unbundle the dev-util/astyle library in favor of system installed
by adding it as build dependency ( >=dev-util/astyle-3.0.1-r1:0= ):

1. patching (update) the Codeblocks Astyle plugin to be compatible with dev-util/astyle-3.1:
"codeblocks-17.12_update_astyle_plugin_to_v3.1.patch" that is taken from upstream:

https://sourceforge.net/p/codeblocks/code/11266/

  * updated astyle plugin to v3.1
  * removed obsolete astyle options
  * added new astyle options
  Authored by: jenslody 2018-01-15

(using conditional patching depends on if '>=dev-util/astyle-3.1' is installed in system);

2. use sub-sloting of dev-util/astyle to force rebuild Codeblocks on system update
if sub-slot of dev-util/astyle is changed;

3. remove KEYWORD "arm" to avoid repoman QA warning about "dependency.bad" and
"dependency.badindev" due to dev-util/astyle dependency doesn't have this KEYWORD.

Closes: https://bugs.gentoo.org/383037
Closes: https://bugs.gentoo.org/656758
  • Loading branch information
band-a-prend authored and leio committed Jul 14, 2018
1 parent f74b3be commit 27c7e3e
Show file tree
Hide file tree
Showing 3 changed files with 426 additions and 4 deletions.
8 changes: 6 additions & 2 deletions dev-util/codeblocks/codeblocks-17.12-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
HOMEPAGE="http://www.codeblocks.org/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
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)
Expand All @@ -31,15 +31,19 @@ RDEPEND="app-arch/zip

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 "${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
fi
eautoreconf
}

Expand Down
8 changes: 6 additions & 2 deletions dev-util/codeblocks/codeblocks-17.12-r301.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
HOMEPAGE="http://www.codeblocks.org/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
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)
Expand All @@ -31,15 +31,19 @@ RDEPEND="app-arch/zip

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 "${FILESDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
fi
eautoreconf
}

Expand Down
Loading

0 comments on commit 27c7e3e

Please sign in to comment.