Bump

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 153 insertions, 25 deletions

diff --git a/sci-mathematics/nusmv/ChangeLog b/sci-mathematics/nusmv/ChangeLog
index 91587ab07024..cd5dab0ee9f0 100644
--- a/sci-mathematics/nusmv/ChangeLog
+++ b/sci-mathematics/nusmv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/nusmv
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/ChangeLog,v 1.13 2012/04/25 17:08:40 jlec Exp $
+# 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 $
+
+*nusmv-2.5.3 (02 Feb 2013)
+
+  02 Feb 2013; Patrick Lauer <patrick@gentoo.org> +nusmv-2.5.3.ebuild:
+  Bump
 
   25 Apr 2012; Justin Lecher <jlec@gentoo.org> nusmv-2.3.1.ebuild,
   nusmv-2.5.0.ebuild, nusmv-2.5.2.ebuild, metadata.xml:
@@ -56,4 +61,3 @@
   +nusmv-2.3.1.ebuild:
   Initial commit. Ebuild by Robin H. Johnson <robbat2@gentoo.org>. This ebuild
   may need revisiting when GCC4.2 is closer to final.
-
diff --git a/sci-mathematics/nusmv/Manifest b/sci-mathematics/nusmv/Manifest
index af200e3499a9..541ae4e9c3c3 100644
--- a/sci-mathematics/nusmv/Manifest
+++ b/sci-mathematics/nusmv/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX MiniSat_v1.14-optimizedlib.patch 1112 RMD160 9ae63aef1b74fac1bad9ee62049460856b5c5982 SHA1 7a2ee88eef0591690a2a728c07b68fdd882addda SHA256 21016b1ce69553c058385afa93f13248dbdc398c7968609d86dd9b707e227bfb
-AUX MiniSat_v1.14_gcc41.patch 4568 RMD160 59cccf1bfd15a4913c6026875639212859ce1ffa SHA1 532288df7231053ec41bbc11a02a1ec12ec396a4 SHA256 05179a822cca176f76340b2a5a9ffab1128d7018a1dfee743fb937abdc8233d9
-AUX cudd-no-pentium4.patch 543 RMD160 c8e515030b86b8e4015d9ced671f3e3a23198521 SHA1 dea4d453e9db55711a69a607e708bdf16359e09b SHA256 6e6818a69c111d28eb17d177e0935a065fbcdb844fcd06583cb59fe547a42edb
-DIST MiniSat_v1.14_src.zip 29428 RMD160 d5f0dc611a6116128d9a404f9045e02b185958b4 SHA1 266536cf5e5e77aa0478b98869bcd67ac1a523b6 SHA256 8e5e0ee84a770dcb3abd6fc65ed4aef938f9ffabca5ddc8a739029f7fb58a8f5
-DIST NuSMV-2.3.1.tar.gz 2590944 RMD160 74f00e1c29dabe98e04cf0d652b92d63a73b07dc SHA1 588d3b43f136273176f4a6056b474f9d872b977b SHA256 b8ba0f29afafdfdef8c30f722eead3ef6cbb17e4bfe5563240a01d8a99dbbf68
-DIST NuSMV-2.5.0.tar.gz 3792968 RMD160 aaa3b9dc1329ad3feca6c9511b144437caf83472 SHA1 4b2837b0511e9eaf0eee53395308e8eaba6be727 SHA256 59310f5f23f72cb1ad16419e40f245db7c5aa41c0f59ba5c75732bb6c4b56ff1
-DIST NuSMV-2.5.2.tar.gz 3631420 RMD160 1f2e9e3481f4aa51d9ff4ede8c665f36009be212 SHA1 3638b6f392fd0cecdb7ada4343364581b957e70a SHA256 bc41c53c266d41d7bcb92851fbdb07d894c246d1189bfe420301c7b4fca46de0
-EBUILD nusmv-2.3.1.ebuild 3277 RMD160 93787bffd819f3766f41253d1460439b4d120199 SHA1 d8b2102d03b6926026821296d26ec0317cf3acc1 SHA256 a53093c76a79333d24073fe29ea694bb507814fcfdcdae7e1ab8a184141483b3
-EBUILD nusmv-2.5.0.ebuild 3595 RMD160 60c14e9ce82184de0f632970032edaa129cd8fb1 SHA1 638d1cea4b9e687b7b6e91bff154b65fd9ded373 SHA256 bfd33cfc69db582eb3ad69c2243d55c511e37b44d9f5ddcf881f70c3d050478e
-EBUILD nusmv-2.5.2.ebuild 3513 RMD160 2e0d617e68330c4d12b72dcbeeb86e6e5301231c SHA1 1cbc75ad281c5d51946ddc50edd33bfd8fb20268 SHA256 5cd7d7ba326d0bc93a2431ea7bd917f2e04b6fcd803e6a5745ceddca73580202
-MISC ChangeLog 2248 RMD160 d1b575b4cea80ec8288ecfa89cc01d9e3b924c70 SHA1 29ce5c8858326e84bf7894bb07c9a8d9be6d5895 SHA256 4699ac53c64036ce11e381e9feeb1d15305188930200a1bca84a40c45f1c85e6
-MISC metadata.xml 306 RMD160 447811c470bbb6bd665e52d9eccaf0fb633557ec SHA1 f456bd79282372636d9bfd44f0a1e3edd705b4c9 SHA256 42ff8494b9c387e35eeefb8def1a70431c5952faf50b505b2e070a67b0ebce26
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAk+YL54ACgkQgAnW8HDreRZzRgCfa4zCK5gQLQLFGBjASXxxGzLc
-wJIAniBDXQhfycgqC3DuIv6/AZVa8zDU
-=qCxr
------END PGP SIGNATURE-----
+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 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
+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
+MISC metadata.xml 306 SHA256 42ff8494b9c387e35eeefb8def1a70431c5952faf50b505b2e070a67b0ebce26 SHA512 90a79128909d43a8b937c69ffe85a09816081a8ac3274a68900b65b12d51ad46464ede82a45568bfe176760af1d9cc540ffcc0e33464b9056dbbb92edbb113e5 WHIRLPOOL b5255c46c0c749d9ecab1acaa7581bf100690b3e1bc361ec42f6327b30b2cc987a2f5d060323b171cdfea9d0248a440c8bb3b9af1e6a50e4c97d87ca22c3cc84
diff --git a/sci-mathematics/nusmv/nusmv-2.5.3.ebuild b/sci-mathematics/nusmv/nusmv-2.5.3.ebuild
new file mode 100644
index 000000000000..d5efc818332f
--- /dev/null
+++ b/sci-mathematics/nusmv/nusmv-2.5.3.ebuild
@@ -0,0 +1,132 @@
+# 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.3.ebuild,v 1.1 2013/02/02 07:34:52 patrick 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
+
+	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"
+}