[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/kodkod/, sci-mathematics/kodkod/files/, profiles/
commit: acce022383c5f0a0d923e9555cf02fc30373f29f
Author: Michał Górny gentoo org>
AuthorDate: Mon Oct 7 08:26:01 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Oct 7 08:26:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acce0223
sci-mathematics/kodkod: Remove last-rited pkg
Closes: https://bugs.gentoo.org/685802
Signed-off-by: Michał Górny gentoo.org>
profiles/package.mask | 7 -
sci-mathematics/kodkod/Manifest| 2 -
...in-most-specific-varargs-method-selection.patch | 28
sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild | 141 -
sci-mathematics/kodkod/metadata.xml| 21 ---
5 files changed, 199 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index f52bfbb3daa..0d4e79bc039 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1068,13 +1068,6 @@ games-fps/serious-sam-tfe
# Removal in 30 days. Bug #617188.
sys-cluster/lspbs
-# Michał Górny (2019-09-07)
-# sci-mathematics/kodkod: reported to fail to build. Last bumped
-# in 2012. Homepage is gone, and sources are nowhere to be found.
-#
-# Removal in 30 days. Bug #685802.
-sci-mathematics/kodkod
-
# Lars Wendler (2019-09-04)
# Unofficial build. Superseded by official 2.49.5 release.
# Masked for removal.
diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
deleted file mode 100644
index 110c95fc965..000
--- a/sci-mathematics/kodkod/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kodkod-1.5.2.zip 2092639 BLAKE2B
76bcecb5d1063a7ee0244bfc1496e2684007ea3264a967cf2b8757caff96be872a5d7419f7f6ca1d2a990d5eaaaca8d63af950e66c4eb4453de6fc132d5716a0
SHA512
d55d84e1daabe37c6994fd434c157d5eaecd1d0b2bbe4ab5a2d5e0e529a378d0cb8dc1eac5b89336706f899b23b9682dfd1033f4a2caec76485b12966e091df0
-DIST waf-1.7.16 91846 BLAKE2B
1b95a96d1fb67775c905882d2a6e51a53a586b4e2e88399df13ee25dba870cbc28115ead4aac8a7ee4e8fa2b7593b61b88d0388a874a658b81dc4d33ed3207f8
SHA512
ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf
diff --git
a/sci-mathematics/kodkod/files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch
b/sci-mathematics/kodkod/files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch
deleted file mode 100644
index 613d713f007..000
---
a/sci-mathematics/kodkod/files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
kodkod-1.5-orig/src/kodkod/util/ints/Ints.java 2011-09-22
19:00:22.0 +1000
-+++ kodkod-1.5/src/kodkod/util/ints/Ints.java 2013-02-02 22:30:12.825378928
+1100
-@@ -316,25 +316,6 @@
- }
-
- /**
-- * An implementation of Paul Hsieh's hashing function,
-- * described at http://www.azillionmonkeys.com/qed/hash.html.
-- * The method returns a 32 bit hash of the given objects' hash codes,
-- * or zero if the array is empty. Any null references in the array
-- * are taken to have 0 as their hash code value.
-- * @return a 32 bit hash of the given objects' hashCodes
-- */
-- public static int superFastHash(Object... key) {
-- if (key.length==0) return 0;
-- int hash = key.length;
--
-- for(Object o : key) {
-- hash = superFastHashIncremental(o == null ? 0 :
o.hashCode(), hash);
-- }
-- // no end cases since the hashcodes of key parts are ints
-- return superFastHashAvalanche(hash);
-- }
--
-- /**
-* An implementation of an IntSet wrapper for an IntRange.
-*/
- private static final class RangeIntSet extends AbstractIntSet {
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
deleted file mode 100644
index 11c25bef00a..000
--- a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="doc source"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils java-pkg-2 python-any-r1 waf-utils
-
-DESCRIPTION="a constraint solver for relational logic"
-HOMEPAGE="http://alloy.mit.edu/kodkod/index.html;
-SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
- https://waf.googlecode.com/files/waf-1.7.16;
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.6
- app-arch/unzip"
-
-S="${WORKDIR}/kodkod-1.5"
-
-JAVA_SRC_DIR="src"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack "${A% *}"
- cp
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/kodkod/
commit: f8e7859a34fa79137600047b099a2463d9d797db
Author: Michał Górny gentoo org>
AuthorDate: Sun Jul 21 15:46:11 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jul 22 09:28:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e7859a
sci-mathematics/kodkod: Remove mistaken use of PYTHON_REQUIRED_USE
Signed-off-by: Michał Górny gentoo.org>
sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
index 33f6ca4a7bc..11c25bef00a 100644
--- a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
+++ b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -18,7 +18,6 @@ LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEP="${PYTHON_DEPS}"
RDEPEND="${COMMON_DEP}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/kodkod/
commit: 3d648c56def3ca2c73bb0d9eaa64cc6a01b53b9d
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Apr 8 16:57:49 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Apr 9 00:09:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d648c56
sci-mathematics/kodkod: remove old
sci-mathematics/kodkod/kodkod-1.5.2.ebuild | 143 -
1 file changed, 143 deletions(-)
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
deleted file mode 100644
index 230c75396a8..000
--- a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils java-pkg-2 python-any-r1 waf-utils
-
-DESCRIPTION="a constraint solver for relational logic"
-HOMEPAGE="http://alloy.mit.edu/kodkod/index.html;
-SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
- https://waf.googlecode.com/files/waf-1.7.16;
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEP="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.6
- app-arch/unzip"
-
-S="${WORKDIR}/kodkod-1.5"
-
-JAVA_SRC_DIR="src"
-LIBDIR="/usr/"$(get_libdir)"/${PN}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack "${A% *}"
- cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf"
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
- chmod u+x waf \
- || die "Could not set execute permisions on waf file"
- sed -e 's@private N parent, left, right@protected N parent, left,
right@' \
- -e 's@private boolean color@protected boolean color@' \
- -i "${S}/src/kodkod/util/ints/IntTree.java" \
- || die "Could not change private to protected in IntTree.java"
- sed -e 's...@conf.env.LINKFLAGS =@conf.env.LINKFLAGS +=@' \
- -i "${S}/lib/cryptominisat-2.9.1/wscript" \
- -i "${S}/lib/lingeling-276/wscript" \
- || die "Could not fix wscripts to respect LDFLAGS"
- # Fix bug 453162 - sci-mathematics/kodkod-1.5.2: fails to build
- epatch
"${FILESDIR}/${PN}-1.5.2-changes-in-most-specific-varargs-method-selection.patch"
-
- # Fix Bug 458462 sci-mathematics/kodkod-1.5.2: fails to build with
JAVA_PKG_STRICT
- local x=""
- for i in $JAVACFLAGS
- do
- if [ "${x}" == "" ]; then
- x="'${i}'"
- else
- x="${x}, '${i}'"
- fi
- done
- for j in $(find . -name wscript -print)
- do
- sed -e "s@def configure(conf):@def configure(conf):\n
conf.env.JAVACFLAGS = [${x}]@" \
- -i "${j}" \
- || die "Could not set JAVACFLAGS in ${j}"
- done
-}
-
-# note: kodkod waf fails when passed --libdir:
-# waf: error: no such option: --libdir
-src_configure() {
- ${WAF_BINARY:="${S}/waf"}
-
- tc-export AR CC CPP CXX RANLIB
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\"
--prefix=${EPREFIX}/usr $@ configure"
-
- CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
- "--prefix=${EPREFIX}/usr" \
- "$@" \
- configure || die "configure failed"
-}
-
-src_compile() {
- waf-utils_src_compile
- if has doc ${JAVA_PKG_IUSE} && use doc; then
- pushd src/kodkod || die "Could not cd to src/kodkod"
- local doclint="-Xdoclint:none"
- local jv="$(javac -version 2>&1 | cut -d' ' -f 2)"
- if [[ "${jv}" == 1.6* ]] || [[ "${jv}" == 1.7* ]]; then
- doclint=""
- fi
- javadoc ${doclint} -sourcepath
"${S}"/src/kodkod:"${S}"/build/src/kodkod \
- -classpath $(find "${PWD}" -name \*.jar -print | xargs
| sed -e 's@ @:@g') \
- $(find . -name \*.java -print) \
- || die "javadoc failed"
- popd
- fi
-}
-
-src_install() {
- insinto "/usr/"$(get_libdir)
- dodir ${LIBDIR}
- exeinto ${LIBDIR}
- for i in $(find . \( -name \*.so -o -name plingeling \) -print |
xargs); do
- doexe $i
- done
-
- for i in $(find . \( -name kodkod.jar -o -name org.sat4j.core.jar \)
-print | xargs); do
- einfo "java-pkg_dojar $i"
- java-pkg_dojar $i
- done
-
- # javadoc
- if has doc ${JAVA_PKG_IUSE} && use doc; then
- java-pkg_dojavadoc src/kodkod
- fi
-
- # dosrc
-
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/kodkod/
commit: b9b7ce746403acaf96bd496bdc178bffd3aa29b0
Author: David Seifert gentoo org>
AuthorDate: Thu Apr 20 15:51:20 2017 +
Commit: David Seifert gentoo org>
CommitDate: Thu Apr 20 16:39:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b7ce74
sci-mathematics/kodkod: [QA] Add missing python metadata variables
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild | 4 +++-
sci-mathematics/kodkod/kodkod-1.5.2.ebuild| 6 --
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
index 4c2b2603d79..33f6ca4a7bc 100644
--- a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
+++ b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
@@ -13,12 +13,14 @@ DESCRIPTION="a constraint solver for relational logic"
HOMEPAGE="http://alloy.mit.edu/kodkod/index.html;
SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
https://waf.googlecode.com/files/waf-1.7.16;
+
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEP=""
+COMMON_DEP="${PYTHON_DEPS}"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6"
DEPEND="${COMMON_DEP}
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
index 32d46d278ee..230c75396a8 100644
--- a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
+++ b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,12 +13,14 @@ DESCRIPTION="a constraint solver for relational logic"
HOMEPAGE="http://alloy.mit.edu/kodkod/index.html;
SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
https://waf.googlecode.com/files/waf-1.7.16;
+
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEP=""
+COMMON_DEP="${PYTHON_DEPS}"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6"
DEPEND="${COMMON_DEP}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/kodkod/
commit: 9d42d1b6bb6bcba7e6617511ae617cef326fd851
Author: Mark Wright gentoo org>
AuthorDate: Mon Jan 2 22:52:35 2017 +
Commit: Mark Wright gentoo org>
CommitDate: Mon Jan 2 22:52:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d42d1b6
sci-mathematics/kodkod: Fix get_libdir called in global scope, thanks to
mgorny for reporting.
Gentoo-bug: 593380
Package-Manager: portage-2.3.3
sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild | 141 ++
1 file changed, 141 insertions(+)
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
new file mode 100644
index ..a63600c
--- /dev/null
+++ b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+JAVA_PKG_IUSE="doc source"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils java-pkg-2 python-any-r1 waf-utils
+
+DESCRIPTION="a constraint solver for relational logic"
+HOMEPAGE="http://alloy.mit.edu/kodkod/index.html;
+SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
+ https://waf.googlecode.com/files/waf-1.7.16;
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP=""
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.6
+ app-arch/unzip"
+
+S="${WORKDIR}/kodkod-1.5"
+
+JAVA_SRC_DIR="src"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack "${A% *}"
+ cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf"
+}
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ chmod u+x waf \
+ || die "Could not set execute permisions on waf file"
+ sed -e 's@private N parent, left, right@protected N parent, left,
right@' \
+ -e 's@private boolean color@protected boolean color@' \
+ -i "${S}/src/kodkod/util/ints/IntTree.java" \
+ || die "Could not change private to protected in IntTree.java"
+ sed -e 's...@conf.env.LINKFLAGS =@conf.env.LINKFLAGS +=@' \
+ -i "${S}/lib/cryptominisat-2.9.1/wscript" \
+ -i "${S}/lib/lingeling-276/wscript" \
+ || die "Could not fix wscripts to respect LDFLAGS"
+ # Fix bug 453162 - sci-mathematics/kodkod-1.5.2: fails to build
+ epatch
"${FILESDIR}/${PN}-1.5.2-changes-in-most-specific-varargs-method-selection.patch"
+
+ # Fix Bug 458462 sci-mathematics/kodkod-1.5.2: fails to build with
JAVA_PKG_STRICT
+ local x=""
+ for i in $JAVACFLAGS
+ do
+ if [ "${x}" == "" ]; then
+ x="'${i}'"
+ else
+ x="${x}, '${i}'"
+ fi
+ done
+ for j in $(find . -name wscript -print)
+ do
+ sed -e "s@def configure(conf):@def configure(conf):\n
conf.env.JAVACFLAGS = [${x}]@" \
+ -i "${j}" \
+ || die "Could not set JAVACFLAGS in ${j}"
+ done
+}
+
+# note: kodkod waf fails when passed --libdir:
+# waf: error: no such option: --libdir
+src_configure() {
+ ${WAF_BINARY:="${S}/waf"}
+
+ tc-export AR CC CPP CXX RANLIB
+ echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\"
--prefix=${EPREFIX}/usr $@ configure"
+
+ CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
+ "--prefix=${EPREFIX}/usr" \
+ "$@" \
+ configure || die "configure failed"
+}
+
+src_compile() {
+ waf-utils_src_compile
+ if has doc ${JAVA_PKG_IUSE} && use doc; then
+ pushd src/kodkod || die "Could not cd to src/kodkod"
+ local doclint="-Xdoclint:none"
+ local jv="$(javac -version 2>&1 | cut -d' ' -f 2)"
+ if [[ "${jv}" == 1.6* ]] || [[ "${jv}" == 1.7* ]]; then
+ doclint=""
+ fi
+ javadoc ${doclint} -sourcepath
"${S}"/src/kodkod:"${S}"/build/src/kodkod \
+ -classpath $(find "${PWD}" -name \*.jar -print | xargs
| sed -e 's@ @:@g') \
+ $(find . -name \*.java -print) \
+ || die "javadoc failed"
+ popd
+ fi
+}
+
+src_install() {
+ insinto "/usr/"$(get_libdir)
+ dodir "/usr/"$(get_libdir)"/${PN}"
+ exeinto "/usr/"$(get_libdir)"/${PN}"
+ for i in $(find . \( -name \*.so -o -name plingeling \) -print |
xargs); do
+ doexe $i
+ done
+
+ for i in $(find . \( -name kodkod.jar -o -name org.sat4j.core.jar \)
-print | xargs); do
+ einfo "java-pkg_dojar $i"
+ java-pkg_dojar $i
+ done
+
+ # javadoc
+ if has doc ${JAVA_PKG_IUSE} && use doc; then
+
