Version Bump

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

6 files changed, 120 insertions, 9 deletions

diff --git a/dev-libs/maloc/ChangeLog b/dev-libs/maloc/ChangeLog
index 9591256bd3c2..e934d84520fa 100644
--- a/dev-libs/maloc/ChangeLog
+++ b/dev-libs/maloc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/maloc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/ChangeLog,v 1.18 2010/06/27 14:14:27 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/ChangeLog,v 1.19 2010/10/31 14:23:12 jlec Exp $
+
+*maloc-1.4 (31 Oct 2010)
+
+  31 Oct 2010; Justin Lecher <jlec@gentoo.org> +files/1.4-asneeded.patch,
+  maloc-0.2.1-r3.ebuild, +files/1.4-mpi.patch, +maloc-1.4.ebuild:
+  Version Bump
 
   27 Jun 2010; <nixnut@gentoo.org> maloc-0.2.1-r3.ebuild:
   ppc stable #324321
diff --git a/dev-libs/maloc/Manifest b/dev-libs/maloc/Manifest
index 83a56ced0b82..fd8b815c24ca 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.2.1-asneeded.patch 525 RMD160 ca668ffe9ff62d609055b16ced6429571a411866 SHA1 1e98144533411489f80943e5b678bb792361496f SHA256 46f6b4bb0ee25040a7d0117341acebb4e6e9c459737abf0f04772b8dc42e6991
 AUX 0.2.1-mpi.patch 653 RMD160 da9fa5ea837b68538c8c43930d30e9cdeabf1ccf SHA1 eaaf73f2cd210c63bb8ed841481744e587869884 SHA256 9d76868accbd89a8960bd61a35d20da359d4f04744761e0b12fb05440a106800
+AUX 1.4-asneeded.patch 533 RMD160 d80bdc8d199b9cd335d56d2673adae0697c08bcc SHA1 048c038adec7941303c55e9c3a46f01d80b6afc2 SHA256 7c6b2fbe5d159dd2646865b7d182c82d30fd9891959a08af8df7796edf5baf60
+AUX 1.4-mpi.patch 652 RMD160 8f4f13ef3d5440e6df76a0cce734755ada5419a3 SHA1 7127fb76bfd938f852a73a775501f66f22e2bb22 SHA256 db2d9dcbb369988a08e59cea750df35fc91d0d375204d24df03f9c9b66ca4f93
 DIST maloc-0.2-1.tar.gz 739622 RMD160 503cccc43a6e7de76e1ec33c11b45a9f764f9e6b SHA1 2f1b0a0cbc38eda5324228deabc1ea59e4e2253c SHA256 9b29c4b6401adf20ce1ab3c47fe71066ca7952eb10db4b1e6b1440973f616cda
-EBUILD maloc-0.2.1-r3.ebuild 1331 RMD160 1613fb0a108f083c8cadd60b441e3a5633c5ac5d SHA1 abd679ad8c07dd3d360a8f569e5909d2b5fda4a5 SHA256 7a101738e8708b486f4cad330784bf17df78b73042581a632612ce3b28ea53c8
-MISC ChangeLog 2487 RMD160 006bcd5500e9865d42ad5cd7aae52775724d24b3 SHA1 77b5bfd68acc3513c4c98a648668300e60b47339 SHA256 771a4e090824b2dd741fa77132752c02e1e359d65bfa86c81878b8b70630697d
+DIST maloc-1.4.tar.gz 797520 RMD160 52890e85bf94073409a30e80006ae933cc7b738b SHA1 e5a677463a88a8022babf0ed896cb086f00d10bd SHA256 cba0c6730f148bf7ddb77dac07e497655642f43b632256fcebf3192b45af1833
+EBUILD maloc-0.2.1-r3.ebuild 1308 RMD160 28930a2f4f588d34a7e84efd155d51da40d07d76 SHA1 4b0c9ebce66f5bf8234befb1956573ef918b8d35 SHA256 c9b3122e0119e197572dcc65de537ca14a0a7670e3f199d1d2e96a8585702ecb
+EBUILD maloc-1.4.ebuild 1085 RMD160 08c3d705e55e3dc9c742ea2d4b52a4c9aed4db4d SHA1 5e4c99737002b488caf0f4b30528fc1e183ac03d SHA256 08dc26c84a3684aa29331ca2a030aa95fa4aabd5b8b8ce036c489b06daffd24d
+MISC ChangeLog 2667 RMD160 f5f5cfb56d888065fb7e9e4f60d3f8a9c060472b SHA1 b8a154ed132db31b1be582c35d5e94ddd3973dde SHA256 df88a4aa1c8041c03274f361974a7ea207921c35c79f76d2fddfd2df2cae6a90
 MISC metadata.xml 272 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 SHA1 960809f50e770bf2df44dda2557cf62ab9190c13 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzNe9UACgkQgAnW8HDreRY1ZQCfe7Ee0kwh6RhnQau5UXwxUl8J
+dsMAoI7ZorhQdigNArKO6HMAWFJ3olP3
+=z6Do
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/maloc/files/1.4-asneeded.patch b/dev-libs/maloc/files/1.4-asneeded.patch
new file mode 100644
index 000000000000..aed7299e089a
--- /dev/null
+++ b/dev-libs/maloc/files/1.4-asneeded.patch
@@ -0,0 +1,17 @@
+diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
+index 512e1ef..eda73ee 100644
+--- a/src/aaa_lib/Makefile.am
++++ b/src/aaa_lib/Makefile.am
+@@ -49,11 +49,10 @@ else
+ LIBEFENCE =
+ endif
+ 
+-libdir = ${prefix}/lib
+ lib_LTLIBRARIES = libmaloc.la ${LIBEFENCE}
+ 
+ libmaloc_la_SOURCES =
+-libmaloc_la_LIBADD  = ${BASE_LIBS} ${VSYS_LIBS} ${VSH_LIBS} ${PSH_LIBS}
++libmaloc_la_LIBADD  = ${BASE_LIBS} ${VSYS_LIBS} ${VSH_LIBS} ${PSH_LIBS} -lreadline -lm
+ libmaloc_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
+ libefence_la_SOURCES =
diff --git a/dev-libs/maloc/files/1.4-mpi.patch b/dev-libs/maloc/files/1.4-mpi.patch
new file mode 100644
index 000000000000..807d5ddc8d38
--- /dev/null
+++ b/dev-libs/maloc/files/1.4-mpi.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index d82b184..b8c5321 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -397,12 +397,14 @@ AC_SUBST(rl_inc)
+ dnl # ----------------------
+ dnl # HANDLE THE MPI LIBRARY
+ dnl # ----------------------
++mpi_use=""
+ AC_MSG_CHECKING([whether you want MPI])
+-AC_ARG_ENABLE(mpi,
+-    [  --enable-mpi            enable MPI layer [[default=no]]],
+-    [ mpi_use="yes" ],
+-    [ mpi_use=""    ]
+-)
++AC_ARG_ENABLE([mpi],
++    AS_HELP_STRING([--enable-mpi            enable MPI layer [[default=no]]]))
++
++AS_IF([test "x$enable_mpi" = "xyes"], [
++    mpi_use="yes"
++])
+ mpi_lib="";
+ mpi_inc="";
+ if test -z "${mpi_use}"; then
diff --git a/dev-libs/maloc/maloc-0.2.1-r3.ebuild b/dev-libs/maloc/maloc-0.2.1-r3.ebuild
index 977011494480..f6bef1239953 100644
--- a/dev-libs/maloc/maloc-0.2.1-r3.ebuild
+++ b/dev-libs/maloc/maloc-0.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-0.2.1-r3.ebuild,v 1.3 2010/06/27 14:14:27 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-0.2.1-r3.ebuild,v 1.4 2010/10/31 14:23:12 jlec Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit autotools eutils
 
 MY_PV="0.2-1"
 
-DESCRIPTION="Small, portable, abstract C environment library for object-oriented C programming"
-HOMEPAGE="http://scicomp.ucsd.edu/~mholst/codes/maloc/index.html#overview"
+DESCRIPTION="Minimal Abstraction Layer for Object-oriented C/C++ programs"
+HOMEPAGE="http://www.fetk.org/codes/maloc/index.html"
 SRC_URI=" http://cam.ucsd.edu/~mholst/codes/${PN}/${PN}-${MY_PV}.tar.gz"
 
 SLOT="0"
@@ -17,15 +17,17 @@ LICENSE="GPL-2"
 IUSE="mpi static-libs"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
-DEPEND="
+RDEPEND="
 	sys-libs/readline
 	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-mpi.patch
-	epatch "${FILESDIR}"/${PV}-asneeded.patch
+	epatch \
+		"${FILESDIR}"/${PV}-mpi.patch \
+		"${FILESDIR}"/${PV}-asneeded.patch
 	eautoreconf
 }
 
diff --git a/dev-libs/maloc/maloc-1.4.ebuild b/dev-libs/maloc/maloc-1.4.ebuild
new file mode 100644
index 000000000000..024638f8ec4e
--- /dev/null
+++ b/dev-libs/maloc/maloc-1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-1.4.ebuild,v 1.1 2010/10/31 14:23:12 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="Minimal Abstraction Layer for Object-oriented C/C++ programs"
+HOMEPAGE="http://www.fetk.org/codes/maloc/index.html"
+SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="mpi static-libs"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sys-libs/readline
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-mpi.patch \
+		"${FILESDIR}"/${PV}-asneeded.patch
+	eautoreconf
+}
+
+src_configure() {
+	use mpi && export CC="mpicc"
+
+	econf \
+		$(use_enable mpi) \
+		$(use_enable static-libs static) \
+		--disable-triplet \
+		--enable-shared
+}
+
+src_install() {
+	# install libs and headers
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install doc
+	dohtml doc/index.html || die "failed to install html docs"
+}