Version bump #450618 by Agostino Sarubbo.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 181 insertions, 20 deletions

diff --git a/sys-libs/libhugetlbfs/ChangeLog b/sys-libs/libhugetlbfs/ChangeLog
index bef22e09d09c..57771c5119f3 100644
--- a/sys-libs/libhugetlbfs/ChangeLog
+++ b/sys-libs/libhugetlbfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libhugetlbfs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.7 2012/03/07 07:10:59 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.8 2013/01/06 23:04:18 vapier Exp $
+
+*libhugetlbfs-2.15 (06 Jan 2013)
+
+  06 Jan 2013; Mike Frysinger <vapier@gentoo.org> +libhugetlbfs-2.15.ebuild:
+  Version bump #450618 by Agostino Sarubbo.
 
   07 Mar 2012; Tim Harder <radhermit@gentoo.org> libhugetlbfs-2.6.ebuild,
   libhugetlbfs-2.9.ebuild:
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index cf52b79e36b4..ae9a34a7ca31 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,23 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 RMD160 af0851949f0f90a668cf0312d6776cbeb9468643 SHA1 f3ff80fb584da46d0572dce303caab3823280fcd SHA256 60d0e4a9a3a99e7ceab04f1479e6893403d43cb50bb740e8f2f632b05a2ec523
-AUX libhugetlbfs-2.6-noexec-stack.patch 1497 RMD160 1e776f4fda19798084dd5bcc6872a15fd543b1d5 SHA1 cff4e5a2dbabe1b3fde7c73cb663ae87ef70362d SHA256 24de0b668c25568b70c705dbd3e1533c6358ad774ee96720b963ab7cd5226f2f
-AUX libhugetlbfs-2.9-build.patch 1163 RMD160 bffb529ec754a7b6e72707bded9a03df6fc66623 SHA1 0586bd31371677edf8a5161af9a750791d96781d SHA256 7814841600b4cbaa67d041e61a42e81c243f73f3d689b09d23744e9c943c0f78
-DIST libhugetlbfs-2.6.tar.gz 148202 RMD160 541d98c6c5828ec57dc374657596ea1cac8b141e SHA1 eec97b9ae34bce559f7eaf977eeb215359cca141 SHA256 6195fdecee0b370d8a82c76a6c2a5b9892e547de319d8a7f52138a796505e890
-DIST libhugetlbfs-2.9.tar.gz 167149 RMD160 1329327d9a41aa0c09315809f7e683a4dfe2c5e2 SHA1 84ccceda582b01f4f9fd857e4d3aee003f593236 SHA256 8f2adfb85ef5cf83b6024f4249514751901cfea0bb663b7812eac07cae8e8623
-EBUILD libhugetlbfs-2.6.ebuild 3889 RMD160 d4a3a41b0b41bcdb082b20b1356dfe7151780ee8 SHA1 dffa34a0dc3b85cf758f04cc348dedc530bedb07 SHA256 21fb0ca8a1f7970cd00f24a0acd1f5cc339a798f5da9671916371873a6d32f9a
-EBUILD libhugetlbfs-2.9.ebuild 3916 RMD160 5876a1ba801eb63702d0b05c8808aba3e16557ae SHA1 c4372592569bc2be1ae4046a63c1989ecb0d6d85 SHA256 d0880023bc49724cf10c01c88cf99037a192b654d689cdad3fdf92c019f8d8ef
-MISC ChangeLog 1426 RMD160 97f66a55c2a13b7b2b5dcc073d25319b5ca8e4d4 SHA1 8a89b32048c21f3ab6a674bc6a52190274e42920 SHA256 56b5020833ee69c4627acc8f386ff18e32dc5f1cfafdd0754042df94aae68749
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 SHA256 60d0e4a9a3a99e7ceab04f1479e6893403d43cb50bb740e8f2f632b05a2ec523 SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80 WHIRLPOOL c9a803d10b17de076a4a425dc3c5783fc31a51270d98a6e821808263f0fb7f23e688a922bcf62cf78e27f6bae3be0c3268e547bc373a33f8231ecadbf50b2377
+AUX libhugetlbfs-2.6-noexec-stack.patch 1497 SHA256 24de0b668c25568b70c705dbd3e1533c6358ad774ee96720b963ab7cd5226f2f SHA512 8aa87edbd238d28c03c61755480fa2ec6e8454f378f267054d911d26a8b9282ea0ca4d36fe4328205b838ba9a775eb8401316662e022fd673495272296556de4 WHIRLPOOL 360ff3ce07e7a48ad2d0c8aa539f7dc4fe81182100af25abf73fc59fbc6ce2f9af3d9ec60a9fd21fc73a861831507626c44a4478ece0b6f44f056c5c4dfe9606
+AUX libhugetlbfs-2.9-build.patch 1163 SHA256 7814841600b4cbaa67d041e61a42e81c243f73f3d689b09d23744e9c943c0f78 SHA512 d6443875d2dd2e44abfd470ec793b70d0cf5a69931e2c2889a7b204d1c27bc2abc3b0c7149a495845e080cb797b759844c330ad5c467aed7dae0669b7f5b7ff2 WHIRLPOOL 42551cf59b47a0598c04a2321f9ebb1c6177ee561350ac10840ab55588f4adc07372509241c4bd47c7498bb5e786f964ef047bb10b01ad279f771e8be3727fb5
+DIST libhugetlbfs-2.15.tar.gz 178317 SHA256 1ff30080b983b2d067c9f2629e4a4dee0aa37ef664dc3a7241abedbfc8e21a24 SHA512 3e771d0e4c9998d3bc0e079a67ddf35cd18949683d6ec0c260b9e0619a79277b9644fb64bfff227350f3600dd338e6a175b245f56978eceef2624821ed768883 WHIRLPOOL e9bd6424724faa9ca25e0958391304b265e04c80bf89f1040d3efa8ce1e9166747348bce3598d21c74aaa8bbee70b6de219f30a0c027acb84f6fa35f0cda478e
+DIST libhugetlbfs-2.6.tar.gz 148202 SHA256 6195fdecee0b370d8a82c76a6c2a5b9892e547de319d8a7f52138a796505e890
+DIST libhugetlbfs-2.9.tar.gz 167149 SHA256 8f2adfb85ef5cf83b6024f4249514751901cfea0bb663b7812eac07cae8e8623 SHA512 b83eaa734552c795c8555afa4e29ba0914ab14257870c94d8249c4dcfb773e0024210c3199159efbe33a0710437162a6b0ff03971551dfe553dbb0ccb7710bef WHIRLPOOL 8a57e62043ab191a40f7e1abaae4470e8a7f305e875aec3233c67b1fb068ed8132effb078bf4e6542b56f0f4c9865d0d707795bb4a49b7f0b81efce750c0b47a
+EBUILD libhugetlbfs-2.15.ebuild 3903 SHA256 7cbeb06c9419afa87b44297b82ca8ba5f7fc464a21ab60266eda72fc0d4b2062 SHA512 9da2dbc5034e1c49a0af659f41def0679851845fd480c26793c23c294d73aef713d49b1577d074dcdf3c0e7a8886c763da21139c6d836e8d1d83158fb59bba23 WHIRLPOOL ab4aa6c746e289f41f1db51fa746322c1969119fbd07c92d20d387240d2bae05182d80843604610601dd16dfdea0f4f60729c11c1eac58ce32d2bf4fef952397
+EBUILD libhugetlbfs-2.6.ebuild 3889 SHA256 21fb0ca8a1f7970cd00f24a0acd1f5cc339a798f5da9671916371873a6d32f9a SHA512 fde9481e866dd71b05fbda7316aeb8bb5f64c2bf4b71f0ab011b185c722ac913186236a150be66ec6a334351c5771aa050462db47c1d81d62b781be966c3f9fc WHIRLPOOL 653f5dd08008a9b77b35eb8750aa5ac2e7959d5af15d68d02753ab91b37b609999f020d3a6437ae86315919f70d3ac343a5a67f084fa82520724e68e37306773
+EBUILD libhugetlbfs-2.9.ebuild 3916 SHA256 d0880023bc49724cf10c01c88cf99037a192b654d689cdad3fdf92c019f8d8ef SHA512 0ae32184fa5130629033909eae4d5aa417f1f89d4504cb423ea93c84f3661ffe3082fe18375fc0aea2b1d1d525f70f55bf0a40b895dd8dc1ece4721ea6672f17 WHIRLPOOL 6b01852eadda7cabd230001a7957e7bf764707eefc894134c997e58d55f8d6999b41e8a9f40f632a36759ce35b4c75561d35ddec91d3cd087e4fb81d18d37535
+MISC ChangeLog 1579 SHA256 cec5bc8667c536a496ca98da9e2169817dfde19c467d4f3dfcf489ae8735ca79 SHA512 34fddfdf7134252be16a62711524d37491b3899ef4135f083d64d9166cc08d5b8b70979c6322c6d0b90460b9c7d7617f4a776daf7294b9390e94472a2f29bed0 WHIRLPOOL c77e1c6edde3ce625b23bd85bd1989f2b125eb1da90e67af104028a17e1a81a1776ddef4c228ecaeb2cbfc3d01ba013c751a91abe3b8138094667c77c215ae2e
+MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPVwoJAAoJEEqz6FtPBkyjc2EIALPn+WAuJDrpSjNAPtUAqIdM
-Mko4Jv7lXcsq3Adf2cjq4DhWio/RPkopRowXrfP7IX8a+slaOYLl2w4dWAgZwWWt
-6mGoyN0FSFpEArequXfL0ZgBMNRqznS1X+o3XjzV/1oaWjEMCpe3MwuWPeSfZxQE
-M54FjrExYlqp0807ebu+4snG5qTZ+YZc/BuMdD4EbNJOKHF5Z1LZq/y+yBhO0ipG
-xBEPeVp4sQQPQXpGLzc72+PW9lFRvN3qI9AJwd3LIln3YTvqGTZZjV2wscS+qTVy
-wk6cOpOjqLZ1V9WYWdM4dfHaXUeZu3CWdBQZOVXa8PtTVnEbIs/qxPzPf0N9C6A=
-=4hjz
+iQIcBAEBCAAGBQJQ6gN3AAoJELEHsLL7fEFWFL0QAMnDSVvnM81Xi9qgiF5umdmH
+ZhAU4pcUl6fqNoDB+WzItLayjQBzPP58/O7cs/8dXTlZaB2SJBDQhYeHR04aHdCo
+FWsfMoe472LjWgGhHw6icAMYklUvpu1SsCw2kEu34a4B0uHoZK6yrsO9J1zzHpoV
+HZbSGBYZo0riCdeh+DOYariutPldy2SiRrqAS4VfzpC7UdRI5od0fSVQuJO0CocF
+LHQ2bfcIiOentX/QemUSzYObN69LGNFBPzQpIET8q5AlbClrVrNR0JSSyR0MxoQI
+BPtUvtFfLyJCGcRXuJtDuMy5/nH4mkzn2xdHD38VWSJ4gEu9Vy/h65KNqJvfOR3T
+lJI2naKH0S5Sb/RYttLEnknswOInYGl022IA6pR1g+o6h7kM7RASBKRR0NMMQ0hQ
+V6mpXkCvodI/Ef6Lig3A+xQWKmVw1umSkmj8yqkKNhOq/uPl99yY0KC1h6SA+tJB
+C2129TbfhK9Hj743lUtLvuEBcUw/CSP2lPtdwsdZMvIDSCYHCCbArMstJhEAsuKh
+BpqxS7s4TIyigeUCh+gaQgYWw8B5wnud5byxj9Dga9nroTRWK/IT8CEbf2h+chp3
+ivS5u7ZrfW4TDDhXBAwkfoaAeXw/YGxRa/f4Jo3MQEVp7fbUAEuDAW4aqMhVJttd
+dlRLlt4y56TnsDR006Ca
+=wQvv
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.15.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.15.ebuild
new file mode 100644
index 000000000000..e4a5ccc90eef
--- /dev/null
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.15.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/libhugetlbfs-2.15.ebuild,v 1.1 2013/01/06 23:04:18 vapier Exp $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="easy hugepage access"
+HOMEPAGE="http://libhugetlbfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9-build.patch #332517
+	epatch "${FILESDIR}"/${PN}-2.6-noexec-stack.patch
+	epatch "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
+	sed -i \
+		-e '/^PREFIX/s:/local::' \
+		-e '1iBUILDTYPE = NATIVEONLY' \
+		-e '1iV = 1' \
+		-e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \
+		-e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
+		Makefile
+	if [ "$(get_libdir)" == "lib64" ]; then
+		sed -i \
+			-e "/^LIB\(32\)/s:=.*:= lib32:" \
+				Makefile
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake libs tools
+}
+
+src_install() {
+	default
+#emake install DESTDIR="${D}"
+#	dodoc HOWTO NEWS README
+	rm "${D}"/usr/bin/oprofile* || die
+}
+
+src_test_alloc_one() {
+	hugeadm="$1"
+	sign="$2"
+	pagesize="$3"
+	pagecount="$4"
+	${hugeadm} \
+		--pool-pages-max ${pagesize}:${sign}${pagecount} \
+	&& \
+	${hugeadm} \
+		--pool-pages-min ${pagesize}:${sign}${pagecount}
+	return $?
+}
+
+# die is NOT allowed in this src_test block after the marked point, so that we
+# can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise.
+src_test() {
+	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
+	einfo "Building testsuite"
+	emake -j1 tests "Failed to build tests"
+
+	hugeadm='obj/hugeadm'
+	allocated=''
+	rc=0
+	# the testcases need 64MiB per pagesize.
+	MIN_HUGEPAGE_RAM=$((64*1024*1024))
+
+	einfo "Planning allocation"
+	PAGESIZES="$(${hugeadm} --page-sizes-all)"
+
+	# Need to do this before we can create the mountpoints.
+	for pagesize in ${PAGESIZES} ; do
+		# The kernel depends on the location :-(
+		mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
+		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
+	done
+	addwrite /proc/sys/vm/
+	addwrite /proc/sys/kernel/shmall
+	addwrite /proc/sys/kernel/shmmax
+	addwrite /proc/sys/kernel/shmmni
+
+	einfo "Checking HugeTLB mountpoints"
+	${hugeadm} --create-mounts || die "Failed to set up hugetlb mountpoints."
+
+	# -----------------------------------------------------
+	# --------- die is unsafe after this point. -----------
+	# -----------------------------------------------------
+
+	einfo "Starting allocation"
+	for pagesize in ${PAGESIZES} ; do
+		pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
+		einfo "  ${pagecount} @ ${pagesize}"
+		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
+		src_test_alloc_one "$hugeadm" "+" "${pagesize}" "${pagecount}"
+		rc=$?
+		if [[ $rc -eq 0 ]]; then
+			allocated="${allocated} ${pagesize}:${pagecount}"
+		else
+			eerror "Failed to add ${pagecount} pages of size ${pagesize}"
+		fi
+	done
+
+	einfo "Allocation status"
+	${hugeadm} --pool-list
+
+	if [[ -n "${allocated}" ]]; then
+		# All our allocations worked, so time to run.
+		einfo "Starting tests"
+		cd "${S}"/tests
+		TESTOPTS="-t func"
+		case $ARCH in
+			amd64|ppc64)
+				TESTOPTS="${TESTOPTS} -b 64"
+				;;
+			x86)
+				TESTOPTS="${TESTOPTS} -b 32"
+				;;
+		esac
+		# This needs a bit of work to give a nice exit code still.
+		./run_tests.py ${TESTOPTS}
+		rc=$?
+	else
+		eerror "Failed to make HugeTLB allocations."
+		rc=1
+	fi
+
+	einfo "Cleaning up memory"
+	cd "${S}"
+	# Cleanup memory allocation
+	for alloc in ${allocated} ; do
+		pagesize="${alloc/:*}"
+		pagecount="${alloc/*:}"
+		einfo "  ${pagecount} @ ${pagesize}"
+		src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
+	done
+
+	# ---------------------------------------------------------
+	# --------- die is safe again after this point. -----------
+	# ---------------------------------------------------------
+
+	return $rc
+}