gentoo resync : 10.04.2018

2 files changed, 0 insertions, 144 deletions

diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
index 42e4c8eb0412..40a523d9ddab 100644
--- a/sci-mathematics/kodkod/Manifest
+++ b/sci-mathematics/kodkod/Manifest
@@ -2,5 +2,4 @@ AUX kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch 1045 BL
 DIST kodkod-1.5.2.zip 2092639 BLAKE2B 76bcecb5d1063a7ee0244bfc1496e2684007ea3264a967cf2b8757caff96be872a5d7419f7f6ca1d2a990d5eaaaca8d63af950e66c4eb4453de6fc132d5716a0 SHA512 d55d84e1daabe37c6994fd434c157d5eaecd1d0b2bbe4ab5a2d5e0e529a378d0cb8dc1eac5b89336706f899b23b9682dfd1033f4a2caec76485b12966e091df0
 DIST waf-1.7.16 91846 BLAKE2B 1b95a96d1fb67775c905882d2a6e51a53a586b4e2e88399df13ee25dba870cbc28115ead4aac8a7ee4e8fa2b7593b61b88d0388a874a658b81dc4d33ed3207f8 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf
 EBUILD kodkod-1.5.2-r1.ebuild 3837 BLAKE2B 509854ca2cbcf2587795051c70e7193ca52289021fa7a407ea13e9178b5e86c9340749758c7d6dd5b4c846ba3c2e3c8fb5d3db573268f39f0191328904106be0 SHA512 76b42bb0e823f1bfe318af13cee2a2b6a8f93d49b3dca93a92bcf3eb876351a684464d03c5d5e7eed4227501ca37c5c306c44e330cbba9f8e3766afacbbef2a2
-EBUILD kodkod-1.5.2.ebuild 3835 BLAKE2B a2335b2ebf4a91da694caa17ec4241b51f2bd89eddbb6b72a45508959c11cf01cc6ad9b189e2c7f05f06441497ba0a01bbeec267e8cc7a150bb11aac09d5df06 SHA512 eb5da579f6a4ecdc317a13c497b1c89fad986cf65e77e8881ca7c9370761878f5d71737196c685a08c857c59f267e29703bef68c6186f5f1622111a786303e64
 MISC metadata.xml 927 BLAKE2B 678d66d0843b85a81ffbdeb2c8e498af617eb125fa62009e4a06373f9c9965d5c77fd69e4892765e54f214f3302bdc658ea4c6cd3e4266b6e88b3bccfa5abac1 SHA512 6ef6a53f3a21c6786ba6044925d13de7bf396a3e59d1810e963a75005575e57d9a816ac765338055f1d7a3f05f7fda8c98d6a357da7d310a223b0158d887b307
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 230c75396a8e..000000000000
--- 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
-	if has source ${JAVA_PKG_IUSE} && use source; then
-		local srcdirs=""
-		if [[ ${JAVA_SRC_DIR} ]]; then
-			local parent child
-			for parent in ${JAVA_SRC_DIR}; do
-				for child in ${parent}/*; do
-					srcdirs="${srcdirs} ${child}"
-				done
-			done
-		else
-			# take all directories actually containing any sources
-			srcdirs="$(cut -d/ -f1 ${sources} | sort -u)"
-		fi
-		java-pkg_dosrc ${srcdirs}
-	fi
-}