From 8be70107efbb417f839292165ee39d07a062046f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jan 2018 06:19:51 +0000 Subject: gentoo resync : 13.01.2018 --- dev-libs/gecode/Manifest | 4 +- dev-libs/gecode/gecode-3.7.3-r1.ebuild | 18 +++----- dev-libs/gecode/gecode-4.4.0-r1.ebuild | 79 --------------------------------- dev-libs/gecode/gecode-4.4.0-r2.ebuild | 81 ++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 93 deletions(-) delete mode 100644 dev-libs/gecode/gecode-4.4.0-r1.ebuild create mode 100644 dev-libs/gecode/gecode-4.4.0-r2.ebuild (limited to 'dev-libs/gecode') diff --git a/dev-libs/gecode/Manifest b/dev-libs/gecode/Manifest index aaaa2cf8b511..2d9ea6a788b3 100644 --- a/dev-libs/gecode/Manifest +++ b/dev-libs/gecode/Manifest @@ -1,6 +1,6 @@ AUX gecode-4.4.0-no-examples.patch 463 BLAKE2B af3a815d3499a4cce304d8d42afcf6a9c134a52156f4d97c7f3d8066c724427f5b4b74aa7fac9578c08578b396e5688a049b01c88ddd2620f3dd64696c9595e9 SHA512 bf9b4fb44338ffdb6be6bc6bf601697bbf8a7d7f2518c753dff8306f58af1d4c03024785d1d47446518364eb485791c2b245f7ec6e8ff63aa0a37e9f8656d61b DIST gecode-3.7.3.tar.gz 1643336 BLAKE2B bf36fec6ee7f9f76be578de084f6d5c60afb9c01e6d66dcb6e7f35e0105fbf3be9017f8377f09a00502bcd4bc02f97083d23ceb42de16f5361c388fa332f9dba SHA512 292bafeaca3911b8af40d7c0f425cf0263f4408afad47f4f229a821ce89d06dc69ad1feeeef72531a1e711d797d249581b67c2d9cfdc9e544240012c838d2a5b DIST gecode-4.4.0.tar.gz 2889186 BLAKE2B b98692f841f8af292371b222c5dd8fda771eee48664e415daa84fd34c6430276fbc96c127491c8eb0fb86c1744f4137ecd1556420ddddc72af70ff0712999bd7 SHA512 5189a3c5f9f34371a0bc94528e8ca65efb0a3078ec158887f47a816d6fe3c879a7e908ee421414bc317754333ecb73806c8fc46b0b6b7d8419cdf6f13a4f8aef -EBUILD gecode-3.7.3-r1.ebuild 841 BLAKE2B 7049aa41cfcce6c6ded71852431e29ecd676fabce57671ceb64792f28609983856fa0444e4c87d7d419feed5ea73a8f413bee1160ca3d7602d3c8cc06ce09465 SHA512 245eb4bc7175f03dd0bea46ba39a3ba2939dbe376120504de4ce51dd54565dbe2efff7d66f609b742520d16f3e80cfb038fba32590d4d7f22e4bac0e66867028 -EBUILD gecode-4.4.0-r1.ebuild 1516 BLAKE2B b7a91d6ce8cd9559724b94a7936c030dec07464b5bf5b082d22bd14e989f9ce8e40e28ab38ec4dd42824075691e49c078200d6983665d7e51d28fa1dfcb02f7f SHA512 d516a56f01885ff293df777811ade1f0c0f9bed380abb8b05ec0bc5a082d6d26da233d49ecf11fd237df4cdbae88e4a7d0b904d3549054526308f7039fb779ee +EBUILD gecode-3.7.3-r1.ebuild 722 BLAKE2B 0962e7c10c56af0b455ea12fef13590ef8ce17a099d9a5b143955a0fd794bb2309bdfc004336d44fae5e8e900ecc6e248840e5bff3cdae5bfcf385e731bb54cc SHA512 9c75e8ad0bf141feb626fc082cc0d7ca0fa5616060828bc1a09cd36c254de18a02e58d676a2da2e40a6f83aed9cfccea15d8c0b7d7cff6f892689433a8a63204 +EBUILD gecode-4.4.0-r2.ebuild 1563 BLAKE2B 5e25dcbc20eca89520637dbd358ea392c15f3373fe1c3b39a034d7e5b26592fc865fc4763aa17a16502f4652152290475e96641b365be7669873db69bb17c2c3 SHA512 6c0ed6549afa92ca8adde52684bfc6e88539a6f6e077cc53dfbd5b34b1f217b9d8d4d934b27c0b5894db735f126b575151b97bb04f95ee88a8d1080ea12fa190 MISC metadata.xml 358 BLAKE2B 5b3d5ca409a8a649ed5b12a183102cca98e71be6195e0d0ec3a62d12441a33962d7514806642402695e9d98853d85047771979089fafe8ec1f7c6da9a20fbe73 SHA512 dfa79307fe5693ac03c56589907f414074c21d584c652a542e1ff409fedfe8b43a130e842cf4fe949d30d483d047c73d14906094b7656118b0e31461eb03dc06 diff --git a/dev-libs/gecode/gecode-3.7.3-r1.ebuild b/dev-libs/gecode/gecode-3.7.3-r1.ebuild index 644e93c9e264..f586564191f5 100644 --- a/dev-libs/gecode/gecode-3.7.3-r1.ebuild +++ b/dev-libs/gecode/gecode-3.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -10,22 +10,16 @@ HOMEPAGE="http://www.gecode.org/" SLOT="0" LICENSE="MIT" KEYWORDS="~amd64 ~x86" -IUSE="doc examples gist" - -DEPEND="gist? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - media-libs/freetype - media-libs/libpng - >=dev-libs/glib-2 -)" +IUSE="doc examples" + +DEPEND="" RDEPEND="${DEPEND}" src_configure() { econf \ --disable-examples \ - $(use_enable gist qt) \ - $(use_enable gist) + --disable-gist \ + --disable-qt } src_compile() { diff --git a/dev-libs/gecode/gecode-4.4.0-r1.ebuild b/dev-libs/gecode/gecode-4.4.0-r1.ebuild deleted file mode 100644 index 3a38dc91e039..000000000000 --- a/dev-libs/gecode/gecode-4.4.0-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools qmake-utils - -DESCRIPTION="An environment for developing constraint-based applications" -HOMEPAGE="http://www.gecode.org/" -SRC_URI="http://www.gecode.org/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples gist gmp" - -RDEPEND=" - gist? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - gmp? ( - dev-libs/gmp:0 - dev-libs/mpfr:0 - )" -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - doc? ( - app-doc/doxygen - media-gfx/graphviz - )" - -PATCHES=( "${FILESDIR}/${PN}-4.4.0-no-examples.patch" ) - -src_prepare() { - default - - sed -i gecode.m4 \ - -e "s/-ggdb//" -e "s/-O3//" -e "s/-pipe//" \ - -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt4_get_bindir)/qmake)" \ - -e "/AC_CHECK_PROGS(MOC/a AC_SUBST(MOC,$(qt4_get_bindir)/moc)" \ - || die - - eautoreconf -} - -src_configure() { - # --disable-examples prevents COMPILING the examples. - econf \ - --disable-examples \ - $(use_enable doc doc-dot) \ - $(use_enable doc doc-tagfile) \ - $(use_enable gist qt) \ - $(use_enable gist) \ - $(use_enable gmp mpfr) -} - -src_compile() { - default - use doc && emake doc -} - -src_test() { - LD_LIBRARY_PATH="${S}" emake test - LD_LIBRARY_PATH="${S}" ./test/test || die "test suite failed" -} - -src_install() { - default - - # The --docdir and --htmldir that we pass to configure don't seem to - # be respected... - use doc && dodoc -r doc/html/ - - if use examples; then - dodoc -r examples - fi -} diff --git a/dev-libs/gecode/gecode-4.4.0-r2.ebuild b/dev-libs/gecode/gecode-4.4.0-r2.ebuild new file mode 100644 index 000000000000..4642b6d3496b --- /dev/null +++ b/dev-libs/gecode/gecode-4.4.0-r2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools qmake-utils + +DESCRIPTION="An environment for developing constraint-based applications" +HOMEPAGE="http://www.gecode.org/" +SRC_URI="http://www.gecode.org/download/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples gist gmp" + +RDEPEND=" + gist? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + gmp? ( + dev-libs/gmp:0 + dev-libs/mpfr:0 + )" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + doc? ( + app-doc/doxygen + media-gfx/graphviz + )" + +PATCHES=( "${FILESDIR}/${PN}-4.4.0-no-examples.patch" ) + +src_prepare() { + default + + sed -i gecode.m4 \ + -e "s/-ggdb//" -e "s/-O3//" -e "s/-pipe//" \ + -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" \ + -e "/AC_CHECK_PROGS(MOC/a AC_SUBST(MOC,$(qt5_get_bindir)/moc)" \ + || die + + eautoreconf +} + +src_configure() { + # --disable-examples prevents COMPILING the examples. + econf \ + --disable-examples \ + $(use_enable doc doc-dot) \ + $(use_enable doc doc-tagfile) \ + $(use_enable gist qt) \ + $(use_enable gist) \ + $(use_enable gmp mpfr) +} + +src_compile() { + default + use doc && emake doc +} + +src_test() { + LD_LIBRARY_PATH="${S}" emake test + LD_LIBRARY_PATH="${S}" ./test/test || die "test suite failed" +} + +src_install() { + default + + # The --docdir and --htmldir that we pass to configure don't seem to + # be respected... + use doc && dodoc -r doc/html/ + + if use examples; then + dodoc -r examples + fi +} -- cgit v1.2.3