Remove IUSE='prof' since it only adds -pg to flags, simplify 'if' logic, fix quotes, respect LDFLAGS, add missing dies, move variables definitions to pkg_setup, use emake instead of gmake, use dodoc for pdf file. Drop old.

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

5 files changed, 97 insertions, 91 deletions

diff --git a/sci-mathematics/minisat/ChangeLog b/sci-mathematics/minisat/ChangeLog
index e1d1efee193a..221488a45bd6 100644
--- a/sci-mathematics/minisat/ChangeLog
+++ b/sci-mathematics/minisat/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2011/04/10 08:03:44 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/minisat/ChangeLog,v 1.4 2011/04/10 08:40:48 xarthisius Exp $
+
+*minisat-2.2.0-r2 (10 Apr 2011)
+
+  10 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> -minisat-2.2.0-r1.ebuild,
+  +minisat-2.2.0-r2.ebuild, metadata.xml:
+  Remove IUSE='prof' since it only adds -pg to flags, simplify 'if' logic, fix
+  quotes, respect LDFLAGS, add missing dies, move variables definitions to
+  pkg_setup, use emake instead of gmake, use dodoc for pdf file. Drop old.
 
   09 Apr 2011; Steve Arnold <nerdboy@gentoo.org> minisat-2.2.0-r1.ebuild:
   Updated include files to proper directory structure (which other 
diff --git a/sci-mathematics/minisat/Manifest b/sci-mathematics/minisat/Manifest
index c325ec3d0e06..213b0e50903f 100644
--- a/sci-mathematics/minisat/Manifest
+++ b/sci-mathematics/minisat/Manifest
@@ -1,5 +1,17 @@
+-----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-r1.ebuild 1874 RMD160 5b957fcf0fac6554385b0af0d1d3cbf01c132f93 SHA1 05497b4ae692651a6d9c8ff6ebd05184f728909e SHA256 92db3259b35fd7534f57d0846cbcf82fb836983e5adc3880ab078ae5e6bfebdb
-MISC ChangeLog 837 RMD160 b2ca271f784e6b5fbc3b578904cb7a4a4ffb88ae SHA1 a43b302eabf72645669341d3672ef58d140e004d SHA256 1e858399f4c1443cb9d632f08d39ffcd55aab03ed2ec8a6eef13ee3206e22fd7
-MISC metadata.xml 385 RMD160 c3c54db2820acad2a21a2220d0b019609befff70 SHA1 b8aaaf15339df6a4a9ad0e5188582b7096d9ec87 SHA256 8985932b4ea92f71ffad7bde8c70dd42a7a2f49f8ed007969c08fbf420f96cc9
+EBUILD minisat-2.2.0-r2.ebuild 1665 RMD160 7a7b271db6f39addf38f06816afceaaae062c9e6 SHA1 a60f7d33fb2482f82bcdef54a8272ffba10d6551 SHA256 e10ee805ee4f3310aab96f25c5475aac9c7b303efc4de0aa5d0d135fb72ce32b
+MISC ChangeLog 1225 RMD160 fa70730cd8be4fad6d7534f8913127608290227d SHA1 61c7583c8e5d64c489d5afae39e950b815f7da06 SHA256 a5cbaab94ca444f11b79e9b6f6e33f4b6deda2eb055c36645840e3149517c730
+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/metadata.xml b/sci-mathematics/minisat/metadata.xml
index 1c6eb08a7b39..6fe6fbcc1c3c 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -8,6 +8,5 @@
 <use>
 <flag name="extended-solver">Build extended version of SAT solver with
  additional features.</flag>
-<flag name="prof">Build with profiling enabled.</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-mathematics/minisat/minisat-2.2.0-r1.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r1.ebuild
deleted file mode 100644
index d8d1bf86c829..000000000000
--- a/sci-mathematics/minisat/minisat-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r1.ebuild,v 1.2 2011/04/10 08:03:44 nerdboy Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Small yet efficient SAT solver with reference paper."
-HOMEPAGE="http://minisat.se/Main.html"
-SRC_URI="http://minisat.se/downloads/${P}.tar.gz
-	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT"
-
-IUSE="debug doc extended-solver prof"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	if use debug; then
-		myconf="d"
-	elif use prof; then
-		myconf="p"
-	else
-		myconf="r"
-	fi
-
-	sed -i -e "s|-O3|${CFLAGS} ${LDFLAGS}|" mtl/template.mk
-}
-
-src_compile() {
-	tc-export CXX
-	export MROOT="${S}"
-
-	if use extended-solver; then
-		cd simp
-	else
-		cd core
-	fi
-
-	gmake "$myconf" || die "make failed"
-	LIB="${PN}" gmake lib"$myconf" || die "make lib failed"
-	cd "${S}"
-}
-
-src_install() {
-	# somewhat brute-force, but so is the build setup...
-	insinto /usr/include/minisat2
-	doins -r mtl
-	rm -f ${ED}/usr/include/minisat2/mtl/config.mk
-	doins core/Solver.h simp/SimpSolver.h
-
-	insinto /usr/include/minisat2/core && doins core/SolverTypes.h
-	insinto /usr/include/minisat2/utils && doins utils/*.h
-
-	if use extended-solver; then
-		cd simp
-	else
-		cd core
-	fi
-
-	if use debug; then
-		newbin ${PN}_debug ${PN} || die
-		newlib.a lib${PN}_debug.a lib${PN}.a || die
-	elif use prof; then
-		newbin ${PN}_profile ${PN} || die
-		newlib.a lib${PN}_profile.a lib${PN}.a || die
-	else
-		newbin ${PN}_release ${PN} || die
-		newlib.a lib${PN}_release.a lib${PN}.a || die
-	fi
-	cd "${S}"
-
-	dodoc README doc/ReleaseNotes-2.2.0.txt
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/MiniSat.pdf
-	fi
-}
diff --git a/sci-mathematics/minisat/minisat-2.2.0-r2.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..61d78dab0170
--- /dev/null
+++ b/sci-mathematics/minisat/minisat-2.2.0-r2.ebuild
@@ -0,0 +1,73 @@
+# 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 $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Small yet efficient SAT solver with reference paper."
+HOMEPAGE="http://minisat.se/Main.html"
+SRC_URI="http://minisat.se/downloads/${P}.tar.gz
+	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT"
+
+IUSE="debug doc extended-solver"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	if use debug; then
+		myconf="d"
+		myext="debug"
+	else
+		myconf="r"
+		myext="release"
+	fi
+
+	if use extended-solver; then
+		mydir="simp"
+	else
+		mydir="core"
+	fi
+	tc-export CXX
+}
+
+src_prepare() {
+	sed -e "s/\$(CXX) \$^/\$(CXX) \$(LDFLAGS) \$^/" \
+		-i -e "s|-O3|${CFLAGS}|" mtl/template.mk || die
+}
+
+src_compile() {
+	export MROOT="${S}"
+	emake -C ${mydir} "$myconf" || die
+	LIB="${PN}" emake -C ${mydir} lib"$myconf" || die
+}
+
+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
+
+	insinto /usr/include/minisat2/core
+	doins core/SolverTypes.h || die
+
+	insinto /usr/include/minisat2/utils
+	doins utils/*.h || die
+
+	newbin ${mydir}/${PN}_${myext} ${PN} || die
+	newlib.a ${mydir}/lib${PN}_${myext}.a lib${PN}.a || die
+
+	dodoc README doc/ReleaseNotes-2.2.0.txt || die
+	if use doc; then
+		dodoc "${DISTDIR}"/MiniSat.pdf || die
+	fi
+}