Updated to reoroganize headers one last time to fix package collision and

apply cleanup patch (see bug 362813).

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

3 files changed, 29 insertions, 23 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/Manifest b/sci-mathematics/minisat/Manifest
index 213b0e50903f..b137a33fff0a 100644
--- a/sci-mathematics/minisat/Manifest
+++ b/sci-mathematics/minisat/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST MiniSat.pdf 327416 RMD160 3b611bf17b2419525303527f93ef06bb3bb9d93b SHA1 8c17a48b2a93780d56bc2a3da5ddf5b9fce3572a SHA256 53197dbd783c924a2627d75e305706297988494265bd5e5ec873840e5d797ac4
 DIST minisat-2.2.0.tar.gz 43879 RMD160 169ec9116befa9067db9076d26309f7e9ab408dd SHA1 dfc25898bf40e00cf04252a42176e0c0600fbc90 SHA256 92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808
-EBUILD minisat-2.2.0-r2.ebuild 1665 RMD160 7a7b271db6f39addf38f06816afceaaae062c9e6 SHA1 a60f7d33fb2482f82bcdef54a8272ffba10d6551 SHA256 e10ee805ee4f3310aab96f25c5475aac9c7b303efc4de0aa5d0d135fb72ce32b
-MISC ChangeLog 1225 RMD160 fa70730cd8be4fad6d7534f8913127608290227d SHA1 61c7583c8e5d64c489d5afae39e950b815f7da06 SHA256 a5cbaab94ca444f11b79e9b6f6e33f4b6deda2eb055c36645840e3149517c730
+EBUILD minisat-2.2.0-r3.ebuild 1836 RMD160 545803a90a4e379da8cadc58d43aa78b6abc5e59 SHA1 0b50ce0a7723c0f310a02224de656bfc94fee6b6 SHA256 74a46c456f7cefdce2aee37acf62ad3e39ed48d31ea3947232c220d335a7b253
+MISC ChangeLog 1459 RMD160 93de0f7528812e6ca61c959d386bde13e19d95e7 SHA1 eafdf35e3bae7f5a06acc034ef580ffb50333333 SHA256 8c18bfef71cd215bb9c2a83926a8e07e6bb62ecd540b1dd8e55de5c8fa646992
 MISC metadata.xml 330 RMD160 6e83685aa7b33c94cbf0ed0061eff516ee0541bd SHA1 9f4cb95419ec002bad3a371881805a974ba1039a SHA256 70118d36c9752da5de338182725e298062fec6056f02de207b023f0f109e2a3b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk2hbRoACgkQIiMqcbOVdxS2pQP8DcOQQzLoSWvFvTXCtIf9TBUw
-EHroC9Ee3pMQ0Q8a8HWcShkIpxXFm8EBN48BK32sRneTYAnqlzdVpyoiFdg+deH+
-eG+VZb0udftyvdspt9IwsXXfSICGRXp4Z89demnZTT+M7Kch3o38wZGvyGa5NI2Z
-UlkJMqECaVR9Z6GhgzE=
-=o1sH
------END PGP SIGNATURE-----
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