Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/kodkod/
Date: Mon, 09 Apr 2018 00:16:04
Message-Id: 1523232559.3d648c56def3ca2c73bb0d9eaa64cc6a01b53b9d.bman@gentoo
1 commit: 3d648c56def3ca2c73bb0d9eaa64cc6a01b53b9d
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Apr 8 16:57:49 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 9 00:09:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d648c56
7
8 sci-mathematics/kodkod: remove old
9
10 sci-mathematics/kodkod/kodkod-1.5.2.ebuild | 143 -----------------------------
11 1 file changed, 143 deletions(-)
12
13 diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
14 deleted file mode 100644
15 index 230c75396a8..00000000000
16 --- a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
17 +++ /dev/null
18 @@ -1,143 +0,0 @@
19 -# Copyright 1999-2017 Gentoo Foundation
20 -# Distributed under the terms of the GNU General Public License v2
21 -
22 -EAPI="5"
23 -
24 -JAVA_PKG_IUSE="doc source"
25 -PYTHON_COMPAT=( python2_7 )
26 -PYTHON_REQ_USE='threads(+)'
27 -
28 -inherit eutils java-pkg-2 python-any-r1 waf-utils
29 -
30 -DESCRIPTION="a constraint solver for relational logic"
31 -HOMEPAGE="http://alloy.mit.edu/kodkod/index.html"
32 -SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
33 - https://waf.googlecode.com/files/waf-1.7.16"
34 -
35 -LICENSE="MIT"
36 -SLOT="0/${PV}"
37 -KEYWORDS="~amd64 ~x86"
38 -IUSE=""
39 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
40 -
41 -COMMON_DEP="${PYTHON_DEPS}"
42 -RDEPEND="${COMMON_DEP}
43 - >=virtual/jre-1.6"
44 -DEPEND="${COMMON_DEP}
45 - >=virtual/jdk-1.6
46 - app-arch/unzip"
47 -
48 -S="${WORKDIR}/kodkod-1.5"
49 -
50 -JAVA_SRC_DIR="src"
51 -LIBDIR="/usr/"$(get_libdir)"/${PN}"
52 -
53 -pkg_setup() {
54 - python-any-r1_pkg_setup
55 - java-pkg-2_pkg_setup
56 -}
57 -
58 -src_unpack() {
59 - unpack "${A% *}"
60 - cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf"
61 -}
62 -
63 -src_prepare() {
64 - java-pkg-2_src_prepare
65 - chmod u+x waf \
66 - || die "Could not set execute permisions on waf file"
67 - sed -e 's@private N parent, left, right@protected N parent, left, right@' \
68 - -e 's@private boolean color@protected boolean color@' \
69 - -i "${S}/src/kodkod/util/ints/IntTree.java" \
70 - || die "Could not change private to protected in IntTree.java"
71 - sed -e 's@××××××××.LINKFLAGS =@conf.env.LINKFLAGS +=@' \
72 - -i "${S}/lib/cryptominisat-2.9.1/wscript" \
73 - -i "${S}/lib/lingeling-276/wscript" \
74 - || die "Could not fix wscripts to respect LDFLAGS"
75 - # Fix bug 453162 - sci-mathematics/kodkod-1.5.2: fails to build
76 - epatch "${FILESDIR}/${PN}-1.5.2-changes-in-most-specific-varargs-method-selection.patch"
77 -
78 - # Fix Bug 458462 sci-mathematics/kodkod-1.5.2: fails to build with JAVA_PKG_STRICT
79 - local x=""
80 - for i in $JAVACFLAGS
81 - do
82 - if [ "${x}" == "" ]; then
83 - x="'${i}'"
84 - else
85 - x="${x}, '${i}'"
86 - fi
87 - done
88 - for j in $(find . -name wscript -print)
89 - do
90 - sed -e "s@def configure(conf):@def configure(conf):\n conf.env.JAVACFLAGS = [${x}]@" \
91 - -i "${j}" \
92 - || die "Could not set JAVACFLAGS in ${j}"
93 - done
94 -}
95 -
96 -# note: kodkod waf fails when passed --libdir:
97 -# waf: error: no such option: --libdir
98 -src_configure() {
99 - ${WAF_BINARY:="${S}/waf"}
100 -
101 - tc-export AR CC CPP CXX RANLIB
102 - echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr $@ configure"
103 -
104 - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
105 - "--prefix=${EPREFIX}/usr" \
106 - "$@" \
107 - configure || die "configure failed"
108 -}
109 -
110 -src_compile() {
111 - waf-utils_src_compile
112 - if has doc ${JAVA_PKG_IUSE} && use doc; then
113 - pushd src/kodkod || die "Could not cd to src/kodkod"
114 - local doclint="-Xdoclint:none"
115 - local jv="$(javac -version 2>&1 | cut -d' ' -f 2)"
116 - if [[ "${jv}" == 1.6* ]] || [[ "${jv}" == 1.7* ]]; then
117 - doclint=""
118 - fi
119 - javadoc ${doclint} -sourcepath "${S}"/src/kodkod:"${S}"/build/src/kodkod \
120 - -classpath $(find "${PWD}" -name \*.jar -print | xargs | sed -e 's@ @:@g') \
121 - $(find . -name \*.java -print) \
122 - || die "javadoc failed"
123 - popd
124 - fi
125 -}
126 -
127 -src_install() {
128 - insinto "/usr/"$(get_libdir)
129 - dodir ${LIBDIR}
130 - exeinto ${LIBDIR}
131 - for i in $(find . \( -name \*.so -o -name plingeling \) -print | xargs); do
132 - doexe $i
133 - done
134 -
135 - for i in $(find . \( -name kodkod.jar -o -name org.sat4j.core.jar \) -print | xargs); do
136 - einfo "java-pkg_dojar $i"
137 - java-pkg_dojar $i
138 - done
139 -
140 - # javadoc
141 - if has doc ${JAVA_PKG_IUSE} && use doc; then
142 - java-pkg_dojavadoc src/kodkod
143 - fi
144 -
145 - # dosrc
146 - if has source ${JAVA_PKG_IUSE} && use source; then
147 - local srcdirs=""
148 - if [[ ${JAVA_SRC_DIR} ]]; then
149 - local parent child
150 - for parent in ${JAVA_SRC_DIR}; do
151 - for child in ${parent}/*; do
152 - srcdirs="${srcdirs} ${child}"
153 - done
154 - done
155 - else
156 - # take all directories actually containing any sources
157 - srcdirs="$(cut -d/ -f1 ${sources} | sort -u)"
158 - fi
159 - java-pkg_dosrc ${srcdirs}
160 - fi
161 -}