Bug #492696: version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 145 insertions, 4 deletions

diff --git a/sci-mathematics/nusmv/ChangeLog b/sci-mathematics/nusmv/ChangeLog
index cd5dab0ee9f0..cecfdce084f9 100644
--- a/sci-mathematics/nusmv/ChangeLog
+++ b/sci-mathematics/nusmv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/nusmv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/ChangeLog,v 1.14 2013/02/02 07:34:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/ChangeLog,v 1.15 2013/12/28 05:28:43 robbat2 Exp $
+
+*nusmv-2.5.4 (28 Dec 2013)
+
+  28 Dec 2013; Robin H. Johnson <robbat2@gentoo.org> +nusmv-2.5.4.ebuild:
+  Bug #492696: version bump.
 
 *nusmv-2.5.3 (02 Feb 2013)
 
diff --git a/sci-mathematics/nusmv/Manifest b/sci-mathematics/nusmv/Manifest
index 541ae4e9c3c3..21481cce25d1 100644
--- a/sci-mathematics/nusmv/Manifest
+++ b/sci-mathematics/nusmv/Manifest
@@ -1,14 +1,16 @@
 AUX MiniSat_v1.14-optimizedlib.patch 1112 SHA256 21016b1ce69553c058385afa93f13248dbdc398c7968609d86dd9b707e227bfb SHA512 7ced4b2e9579100fa6f3cacbdf1ae4eb652de877f3399e5e3202e9ef7546bf9b33f1a63026973481ba652e784fd95d645bdf896cb8736a11aa338fd24a9d3231 WHIRLPOOL 2873bb733763f38d3f22bdec65027a7db9933b576b9a3483111fdad114a51a7685b126071a3cb3d6c44068af8eae210859de2e6f45089c3d914ab95c63848955
 AUX MiniSat_v1.14_gcc41.patch 4568 SHA256 05179a822cca176f76340b2a5a9ffab1128d7018a1dfee743fb937abdc8233d9 SHA512 30e30ede5bbc91cbb633dd59df27fa7b76f71c26f6fe52846d016a203826f15f936cd576db25934d1651ef4f6690e18caea5073adbf97b7c8ba0dde014bd9dce WHIRLPOOL 4765526d901f34ee92dac847e5b2e6c18cb95f97fec02cc6e0601c8036fc1505e04fb8fd03847ef76013cc18acc266627f92213cdd15dfcd5409d7f97182671e
 AUX cudd-no-pentium4.patch 543 SHA256 6e6818a69c111d28eb17d177e0935a065fbcdb844fcd06583cb59fe547a42edb SHA512 7785697ffaf928cd336a6d5d6183f2b2f0a7dfdf825c233fe5cdc4d8ee5baa9c73ccb2c25b8f6c23ce37813e2c6cb015f17a7187def6075cb22ffb6d4c03a88a WHIRLPOOL e7fc404743383b1c9c45029eea6df67844841ff8bb67ccfa1b4d23104ef230a200e008a5aa92388fa68820422dbe080df1e23e80dabe426d68fceba2702e932f
-DIST MiniSat_v1.14_src.zip 29428 SHA256 8e5e0ee84a770dcb3abd6fc65ed4aef938f9ffabca5ddc8a739029f7fb58a8f5
-DIST NuSMV-2.3.1.tar.gz 2590944 SHA256 b8ba0f29afafdfdef8c30f722eead3ef6cbb17e4bfe5563240a01d8a99dbbf68
+DIST MiniSat_v1.14_src.zip 29428 SHA256 8e5e0ee84a770dcb3abd6fc65ed4aef938f9ffabca5ddc8a739029f7fb58a8f5 SHA512 451839f3b0508ccfc78a65bbdf3d6820d335aea43b32aa2e39168ff515f3eb6f74ab1297186f1a89dc69e4d8663a1479043fd10135faf2dbaf33269ff7b831e1 WHIRLPOOL dea39fd30ad7c4195c5fe07356890c6525744d59644aff89ce865269daa4ffbebbbba94fe929d0bf6df441e169e2fd974b5373a443d5c3fb410ec8d7dffd9cb2
+DIST NuSMV-2.3.1.tar.gz 2590944 SHA256 b8ba0f29afafdfdef8c30f722eead3ef6cbb17e4bfe5563240a01d8a99dbbf68 SHA512 24d258197ecfd314378f132c28722c6f91ee0ee10f5d67e51e924a682c03646b8700e28899eb8ab3ee67b231c26c2094c075b000d391adddfb82bb93a8dfc12b WHIRLPOOL c015aeeabff6fe0770a1d216ab783db0ea4d1915e09e2fa9ac2f470ffbcc6a89881f0e917c544598f7f6484a50b1216ca0e631084887c56bfc2efe29b8f82dbd
 DIST NuSMV-2.5.0.tar.gz 3792968 SHA256 59310f5f23f72cb1ad16419e40f245db7c5aa41c0f59ba5c75732bb6c4b56ff1
 DIST NuSMV-2.5.2.tar.gz 3631420 SHA256 bc41c53c266d41d7bcb92851fbdb07d894c246d1189bfe420301c7b4fca46de0
 DIST NuSMV-2.5.3.tar.gz 3951637 SHA256 d5d6b2873dfa6f82ff9bef1a7eefa36dc5070557aa2b0e0d53cc8c54b2fe437d SHA512 8233a621d3cfad17d0b8f77a33460089b5c0a9fa694e6d91cbd6eb334213cd8d9e37fce8755e9ebc066279f25e86dfa7ded0197f679e42b8f2e7c048cc93356a WHIRLPOOL ea8075f405324179a822b9abd78f2c5d2a0c62ac31d2682f2145db7b033e2cf30f3a466689d75814cc3bfc551471425097d17515b19742f298899a432daec249
+DIST NuSMV-2.5.4.tar.gz 3968258 SHA256 3c250624cba801b1f62f50733f9507b0f3b3ca557ce1cd65956178eb273f1bdf SHA512 fc3cc641bbdbfc9464947c9991c8d363adeed9ed34af215c092a14b32d5ce536cb2dbc4eee1645d5aa85caa85e6e95b695620fa247f3a22652cdc4cd252c4c79 WHIRLPOOL 5822d1e7d853cf78cbdee07b0dafa1216fd226ecad803533310351573c7e9a864e6bba699a16c1b357da458311bf65b7362b6207b63e0c8008123e63950121e1
 EBUILD nusmv-2.3.1.ebuild 3277 SHA256 a53093c76a79333d24073fe29ea694bb507814fcfdcdae7e1ab8a184141483b3 SHA512 c4977f7f565bde95cb63a92f3a3cdc0a6f70c528c27664e783bff5b1502aad89b477dbe07dcee91c28179f48e8e59f20fc825eebe1319ee90ef8ca1291180069 WHIRLPOOL d841f61ba4d45baa8736320088b5e198138ab1c62f5bd6b0f45224376b24b04001e478c1a76352deb3789740d03a9a7936bd814abf8753666e80a9ac5dc66717
 EBUILD nusmv-2.5.0.ebuild 3595 SHA256 bfd33cfc69db582eb3ad69c2243d55c511e37b44d9f5ddcf881f70c3d050478e SHA512 58109110b20e0703112c68d92cecbd8b9dc2fba06674f4d0b9c8178ccfc51727986d4e565159affa319c6f436ec80777f211edf27c2d8556f7459821b7e8b5c7 WHIRLPOOL 1b18397a9f909e772bdf60ef31daa41f901e1cc7205b4b4a080915db57d984da4b3635e11506be2106a939b4a469f03114b86ece50530de7ed3b6cbe37826160
 EBUILD nusmv-2.5.2.ebuild 3513 SHA256 5cd7d7ba326d0bc93a2431ea7bd917f2e04b6fcd803e6a5745ceddca73580202 SHA512 11683caed4b7ffc86effa9606b15ef3493b6fa326001e3903967f38e057800f090735728831ec5354c9c60afed11b68e59f139a766eb5f12a48331bad028749b WHIRLPOOL d9ae53dcd023347d34e96134becf7eee8108be17055c895c3c530905a1460fb10e069fd1bb42f65e97f49225767623326b79f5340aae74b120afffa6e14a7494
 EBUILD nusmv-2.5.3.ebuild 3516 SHA256 d7a2d13d9c47f6b822612d3c1808a9801499fa6ea0e449725f9f52c7f02b7cf8 SHA512 4f17ada7ade2294dd94ff435e5f8adf69d0d00a6b5e59f8797f2cdcf8811efe0c09e41b3af4f31a229551433c03e253f8f30ba0ab3cbd4c914767a85ccd33421 WHIRLPOOL 34ac5dbe0a984e1a4dad395282e924043a73816faa6cdaed445127d9b93dabd0e6858c84a3206544b5a4d3999f70bf9e0d400581d8507815b9d5eb519eaed03e
-MISC ChangeLog 2357 SHA256 bf79bd72d516a39a85060b710d243f8e230132336e03d850b1dd8144019069b3 SHA512 a50e74c529dec4b2acad0547a901fac00c5f6e3803f65d29cc3146a176137d22f1002d13361e3015a8692df7fd57fbba219a0c1f6ef03b762ba6ecafce38e0fa WHIRLPOOL 6db1c45f494b19b06b6eeef5b3f445d76c16104ab4a49c60677a1680bca23b69791c883c309b66d20055dc8f8ba75039c86785f000d951640c57e8a3c6905bf3
+EBUILD nusmv-2.5.4.ebuild 3620 SHA256 b8cecd4c2534fd0ce72ee0238ac4edec814edc51d89fd7973c426433b605da65 SHA512 41d6b4d71a3b9b29b0e19c7e12a196ee4f1e6e3c4d0d5ce37222c6f1773fe8d6b2c3425e27bbebdd5b516f0ec748463e355c1995547d2f941832cfb7c094c8a4 WHIRLPOOL 5d833e6c0f307d6fc6ebfa6938151a92acf6ba8330099fa2c10bb3176cadc3c81d35fb6154cfd5ab769513a1e73221be07339c75d645f540fbbf1a8bc824ccb6
+MISC ChangeLog 2489 SHA256 0efd187dc568a1d9a2db196d60a3cd6c7fbc9926981111e60fd229d35e1390c4 SHA512 6805fad16bf831fcd5e3137c17c54e971204ec3274d849cfd34602344b69a3bce8f70f963ae45fc3d260c3a8e296760c7bbd51c9fe0c20c6ade481d69385ec8b WHIRLPOOL aa550a55af12c8bb7c3161bef7b63f88492f2d6a9d3ab667ca89004ecf82e351de9bf4af7a2bc3cfce236e7c94d59b603f3b18b75d89c51b199c469a7ce2038f
 MISC metadata.xml 306 SHA256 42ff8494b9c387e35eeefb8def1a70431c5952faf50b505b2e070a67b0ebce26 SHA512 90a79128909d43a8b937c69ffe85a09816081a8ac3274a68900b65b12d51ad46464ede82a45568bfe176760af1d9cc540ffcc0e33464b9056dbbb92edbb113e5 WHIRLPOOL b5255c46c0c749d9ecab1acaa7581bf100690b3e1bc361ec42f6327b30b2cc987a2f5d060323b171cdfea9d0248a440c8bb3b9af1e6a50e4c97d87ca22c3cc84
diff --git a/sci-mathematics/nusmv/nusmv-2.5.4.ebuild b/sci-mathematics/nusmv/nusmv-2.5.4.ebuild
new file mode 100644
index 000000000000..cd4b378f8cf8
--- /dev/null
+++ b/sci-mathematics/nusmv/nusmv-2.5.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/nusmv-2.5.4.ebuild,v 1.1 2013/12/28 05:28:43 robbat2 Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+NUSMV_PN="NuSMV"
+NUSMV_PV="${PV}"
+NUSMV_P="${NUSMV_PN}-${NUSMV_PV}"
+NUSMV_A="${NUSMV_P}.tar.gz"
+NUSMV_S="${WORKDIR}/${NUSMV_P}/nusmv"
+
+MINISAT_PN="MiniSat"
+MINISAT_PV="1.14"
+MINISAT_P="${MINISAT_PN}_v${MINISAT_PV}"
+MINISAT_A="${MINISAT_P}_src.zip"
+MINISAT_S="${WORKDIR}/${NUSMV_P}/MiniSat/${MINISAT_P}"
+
+CUDD_PN="cudd"
+CUDD_PV="2.4.1.1"
+CUDD_P="${CUDD_PN}-${CUDD_PV}"
+#CUDD_A is none
+CUDD_S="${WORKDIR}/${NUSMV_P}/${CUDD_P}"
+
+DESCRIPTION="NuSMV: new symbolic model checker"
+HOMEPAGE="http://nusmv.irst.itc.it/"
+SRC_URI="http://nusmv.fbk.eu/distrib/${NUSMV_A}
+		minisat? ( mirror://gentoo/${MINISAT_A} )"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minisat examples"
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl
+		www-client/lynx
+		dev-lang/perl"
+# the above 4 are for docs, which aren't optional yet patches welcome to
+# avoid building the docs but I suspect anybody using this package will
+# actually need them
+S="${NUSMV_S}"
+
+src_unpack() {
+	unpack ${NUSMV_A}
+	if use minisat; then
+		cd "${WORKDIR}"/${NUSMV_P}/MiniSat
+		unpack ${MINISAT_A}
+		epatch ${MINISAT_P}_nusmv.patch
+		epatch "${FILESDIR}"/${MINISAT_P}-optimizedlib.patch
+		epatch "${FILESDIR}"/${MINISAT_P}_gcc41.patch
+	fi
+
+	cd "${CUDD_S}"
+	if [[ "$(tc-arch)" = amd64 ]] ; then
+		mv Makefile_64bit Makefile || die
+	fi
+	sed -i Makefile -e 's/-mcpu=[^\s]*//' || die
+
+	for i in ${NUSMV_S}/doc/{user-man,tutorial}/Makefile.in ; do
+		sed -i.orig \
+			'/install_sh_DATA/s!$(datadir)!$(DESTDIR)$(datadir)!g' \
+			${i} || die "sed $i failed"
+	done
+}
+
+src_compile() {
+	if [[ "$(tc-arch)" = x86 ]] ; then
+		append-flags -DNUSMV_SIZEOF_VOID_P=4 -DNUSMV_SIZEOF_LONG=4 -DNUSMV_SIZEOF_INT=4
+	fi
+	# With LTO, it tried to link for 6 hours on an i7 system before failing.
+	filter-flags -flto -Wl,-flto
+
+	rm -f ${NUSMV_S}/${MINISAT_P}
+	if use minisat; then
+		cd ${MINISAT_S}
+		# do NOT merge these targets
+		emake COPTIMIZE="${CFLAGS}" r || die "Failed to build minisat bin"
+		emake COPTIMIZE="${CFLAGS}" lr || die "Failed to build minisat lib"
+		ln -sf ${MINISAT_S} "${WORKDIR}"/${NUSMV_P}/${MINISAT_P}
+	fi
+
+	cd ${CUDD_S}
+	emake clean || die "Failed to clean cudd out."
+	emake \
+		CPP="$(tc-getCPP)" CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" ICFLAGS="${CFLAGS}" \
+		|| die "Failed to build cudd."
+
+	local myconf="$(use_enable minisat) --enable-pslparser"
+	if use minisat; then
+		myconf="${myconf}
+			--with-minisat-incdir=../${MINISAT_P}
+			--with-minisat-libdir=../${MINISAT_P}"
+	fi
+
+	cd ${NUSMV_S}
+	econf ${myconf}
+	emake || die "emake failed"
+
+	VARTEXFONTS="${T}"/fonts emake docs
+}
+
+src_install() {
+	into /usr
+	if use minisat; then
+		newbin ${MINISAT_S}/minisat_release minisat
+	fi
+
+	dodir /usr/share/nusmv/doc
+	cd ${NUSMV_S}
+	emake DESTDIR="${D}" install || die "emake install failed"
+	# duplicate items
+	rm -f "${D}"/usr/share/nusmv/{LGPL-2.1,README*,NEWS}
+	# real docs
+	dodoc README* NEWS AUTHORS
+	dodoc doc/tutorial/tutorial.pdf
+	dodoc doc/user-man/nusmv.pdf
+
+	# move package-installed docs
+	mv "${D}"/usr/share/nusmv/doc/* "${D}"/usr/share/doc/${PF}/
+	rmdir "${D}"/usr/share/nusmv/doc
+
+	# clean out examples if not needed
+	if use !examples ; then
+		rm -rf "${D}"/usr/share/nusmv/examples || die "Failed to remove examples"
+	fi
+}
+
+src_test() {
+	cd ${NUSMV_S}
+	emake check || die "emake check failed"
+}