Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sci-mathematics/nusmv: version bump to 2.6.0 + EAPI bump. #2271

Closed

Conversation

g-braeunlich
Copy link
Contributor

revbump to 2.6.0. Also porting to EAPI 6. Also porting to EAPI 6

sed -i -e "s:share/nusmv/doc:share/doc/${PF}:" "${S}"/doc/{tutorial,user-man,prog-man}/CMakeLists.txt || die

# Correction for proper parallel compilation
# sed -i -e 's/COMMAND ${MAKE}/COMMAND $(MAKE)/' "${WORKDIR}/${MY_P}/"{zchaff,MiniSat}/CMakeLists.txt || die
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could not fix the parallel building issue yet

@g-braeunlich g-braeunlich force-pushed the sci-mathematics/nusmv branch 2 times, most recently from 6c9f49a to 9b7e0f1 Compare September 7, 2016 16:06
HOMEPAGE="http://nusmv.fbk.eu/"
SRC_URI="http://nusmv.fbk.eu/distrib/${NUSMV_A}
minisat? ( https://github.com/niklasso/minisat/archive/${MINISAT_A} )
zchaff? ( http://www.princeton.edu/~chaff/zchaff/${ZCHAFF_A} )"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please unbundle these and turn them into proper packages

@SoapGentoo SoapGentoo self-assigned this Sep 7, 2016
@monsieurp monsieurp added version bump assigned PR successfully assigned to the package maintainer(s). labels Sep 8, 2016
@monsieurp monsieurp changed the title Sci mathematics/nusmv sci-mathematics/nusmv: version bump to 2.6.0 + EAPI bump. Sep 8, 2016
@g-braeunlich g-braeunlich force-pushed the sci-mathematics/nusmv branch 2 times, most recently from a804a64 to 4953997 Compare September 8, 2016 09:20
@SoapGentoo
Copy link
Member

@g-braeunlich could you unbundle minisat now that its in the tree with all the latest patches?

@SoapGentoo
Copy link
Member

@g-braeunlich could you rebase the merge commits, the unbundling into the EAPI=6 bump?

@g-braeunlich g-braeunlich force-pushed the sci-mathematics/nusmv branch 2 times, most recently from 424fd77 to ba5a4f5 Compare September 19, 2016 16:35
sed -i -e 's/-mcpu=[^\s]*//' "${WORKDIR}/${MY_P}/cudd-2.4.1.1"/Makefile || die
# Prevent automatic build of minisat - we are using the ebuild from portage
sed -i -e 's/ add_subdirectory(${MINISAT_SOURCE_DIR} ${MINISAT_BUILD_DIR})//' \
-e 's/MINISAT_LIB/MiniSat/' CMakeLists.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing || die

# Prevent automatic build of minisat - we are using the ebuild from portage
sed -i -e 's/ add_subdirectory(${MINISAT_SOURCE_DIR} ${MINISAT_BUILD_DIR})//' \
-e 's/MINISAT_LIB/MiniSat/' CMakeLists.txt
sed -i -e 's/DEPENDS MINISAT_BUILD//' code/nusmv/core/sat/solvers/CMakeLists.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing || die

dev-texlive/texlive-latexextra
app-doc/doxygen
)
minisat? ( >=sci-mathematics/minisat-2.2.0_p20130925 )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have you checked that minisat is a pure build-time only dependency? I kinda doubt this, as I recall minisat installing shared objects, which means that nusmv likely links against it.


S="${WORKDIR}/${MY_P}/NuSMV"

DOCS=( AUTHORS NEWS README{,_MiniSat,_PLATFORMS,_zChaff}.txt )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have you tried whether you really need to specify these?

gentoo-bot pushed a commit that referenced this pull request Sep 24, 2016
Package-Manager: portage-2.2.28
Closes: #2271

Signed-off-by: David Seifert <soap@gentoo.org>
@g-braeunlich g-braeunlich deleted the sci-mathematics/nusmv branch September 27, 2016 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s).
Projects
None yet
3 participants