diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2011-04-16 21:43:54 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2011-04-16 21:43:54 +0000 |
| commit | 74c975835e29daef552f55b2cecd02f153d7dcac (patch) | |
| tree | 0bef8ce79206883e8a0bd1f06554cf36f751614b /sci-mathematics | |
| parent | Two new version releases and 2 patches to stable (see ChangeLog). (diff) | |
| download | gentoo-2-74c975835e29daef552f55b2cecd02f153d7dcac.tar.gz gentoo-2-74c975835e29daef552f55b2cecd02f153d7dcac.tar.bz2 gentoo-2-74c975835e29daef552f55b2cecd02f153d7dcac.zip | |
Updated to reoroganize headers one last time to fix package collision and
apply cleanup patch (see bug 362813).
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/minisat/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-mathematics/minisat/minisat-2.2.0-r3.ebuild (renamed from sci-mathematics/minisat/minisat-2.2.0-r2.ebuild) | 27 |
2 files changed, 27 insertions, 9 deletions
diff --git a/sci-mathematics/minisat/ChangeLog b/sci-mathematics/minisat/ChangeLog index 221488a45bd6..662aa5b0c676 100644 --- a/sci-mathematics/minisat/ChangeLog +++ b/sci-mathematics/minisat/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-mathematics/minisat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/minisat/ChangeLog,v 1.4 2011/04/10 08:40:48 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/minisat/ChangeLog,v 1.5 2011/04/16 21:43:53 nerdboy Exp $ + +*minisat-2.2.0-r3 (16 Apr 2011) + + 16 Apr 2011; Steve Arnold <nerdboy@gentoo.org> -minisat-2.2.0-r2.ebuild, + +minisat-2.2.0-r3.ebuild: + Updated to reoroganize headers one last time to fix package collision + and apply cleanup patch. *minisat-2.2.0-r2 (10 Apr 2011) diff --git a/sci-mathematics/minisat/minisat-2.2.0-r2.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r3.ebuild index 61d78dab0170..76eb04624350 100644 --- a/sci-mathematics/minisat/minisat-2.2.0-r2.ebuild +++ b/sci-mathematics/minisat/minisat-2.2.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/minisat/minisat-2.2.0-r2.ebuild,v 1.1 2011/04/10 08:40:48 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/minisat/minisat-2.2.0-r3.ebuild,v 1.1 2011/04/16 21:43:53 nerdboy Exp $ EAPI="4" @@ -52,15 +52,18 @@ src_compile() { src_install() { # somewhat brute-force, but so is the build setup... - insinto /usr/include/minisat2 - doins -r mtl || die - rm -f "${ED}"/usr/include/minisat2/mtl/config.mk || die - doins core/Solver.h simp/SimpSolver.h || die + fix_headers - insinto /usr/include/minisat2/core - doins core/SolverTypes.h || die + insinto /usr/include/${PN}2/mtl + doins mtl/*.h || die - insinto /usr/include/minisat2/utils + insinto /usr/include/${PN}2/core + doins core/Solver*.h || die + + insinto /usr/include/${PN}2/simp + doins simp/Simp*.h || die + + insinto /usr/include/${PN}2/utils doins utils/*.h || die newbin ${mydir}/${PN}_${myext} ${PN} || die @@ -71,3 +74,11 @@ src_install() { dodoc "${DISTDIR}"/MiniSat.pdf || die fi } + +fix_headers() { + # need to fix the circular internal includes a bit for standard usage + elog "Fixing header files..." + + patch -p0 < "${FILESDIR}"/${P}-header_fix.patch \ + || die "header patch failed..." +}
\ No newline at end of file |