Version bump

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 13 insertions, 167 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index 2cae72c319c8..48f9558ab08f 100644
--- a/sci-physics/lhapdf/ChangeLog
+++ b/sci-physics/lhapdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/lhapdf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.25 2014/02/23 02:16:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.26 2014/05/06 16:19:56 bicatali Exp $
+
+*lhapdf-6.1.0 (06 May 2014)
+
+  06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +lhapdf-6.1.0.ebuild,
+  -lhapdf-5.8.9.ebuild, -lhapdf-5.9.1.ebuild, -lhapdf-6.0.4.ebuild:
+  Version bump
 
 *lhapdf-6.0.5 (23 Feb 2014)
 
diff --git a/sci-physics/lhapdf/lhapdf-5.8.9.ebuild b/sci-physics/lhapdf/lhapdf-5.8.9.ebuild
deleted file mode 100644
index f1f72a8d6469..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.8.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.9.ebuild,v 1.2 2013/10/30 17:16:28 bicatali Exp $
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit versionator autotools-utils python-single-r1
-
-MY_PV=$(get_version_component_range 1-3 ${PV})
-MY_PF=${PN}-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="http://projects.hepforge.org/lhapdf/"
-SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz
-	test? (
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/cteq61.LHgrid
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/MRST2004nlo.LHgrid
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/cteq61.LHpdf
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/CT10.LHgrid
-		octave? ( http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/cteq5l.LHgrid ) )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples octave python static-libs test"
-REQUIRED_USE="octave? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	octave? ( sci-mathematics/octave )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )
-	python? ( dev-lang/swig )"
-
-S="${WORKDIR}/${MY_PF}"
-
-src_prepare() {
-	# do not create extra latex docs
-	sed -i \
-		-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \
-		ccwrap/Doxyfile || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable cxx ccwrap)
-		$(use_enable cxx old-ccwrap)
-		$(use_enable doc doxygen)
-		$(use_enable octave)
-		$(use_enable python pyext)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	# need to make a bogus link for octave test
-	ln -s "${DISTDIR}" PDFsets
-	LHAPATH="${PWD}/PDFsets" \
-		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
-		emake check
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && use cxx && dohtml -r ccwrap/doxy/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{f,cc}
-	fi
-}
-
-pkg_postinst() {
-	elog "To install data files, you have to run as root:"
-	elog "lhapdf-getdata --dest=${EROOT%/}/usr/share/lhapdf/PDFsets --all"
-}
diff --git a/sci-physics/lhapdf/lhapdf-5.9.1.ebuild b/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
deleted file mode 100644
index d6c78cabd5d2..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.9.1.ebuild,v 1.1 2013/10/30 17:16:28 bicatali Exp $
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit versionator autotools-utils python-single-r1
-
-MY_PV=$(get_version_component_range 1-3 ${PV})
-MY_PF=${PN}-${MY_PV}
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="http://projects.hepforge.org/lhapdf/"
-SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz
-	test? (
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/cteq61.LHgrid
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/MRST2004nlo.LHgrid
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/cteq61.LHpdf
-		http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/CT10.LHgrid
-		octave? ( http://www.hepforge.org/archive/${PN}/pdfsets/${MY_PV}/cteq5l.LHgrid ) )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples octave python static-libs test"
-REQUIRED_USE="octave? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	octave? ( sci-mathematics/octave )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )
-	python? ( dev-lang/swig )"
-
-S="${WORKDIR}/${MY_PF}"
-
-src_prepare() {
-	# do not create extra latex docs
-	sed -i \
-		-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \
-		ccwrap/Doxyfile || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable cxx ccwrap)
-		$(use_enable cxx old-ccwrap)
-		$(use_enable doc doxygen)
-		$(use_enable octave)
-		$(use_enable python pyext)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	# need to make a bogus link for octave test
-	ln -s "${DISTDIR}" PDFsets
-	LHAPATH="${PWD}/PDFsets" \
-		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
-		emake check
-}
-
-src_install() {
-	autotools-utils_src_install
-	use python \
-		&& python_fix_shebang "${ED}"/usr/bin/lhapdf-{getdata,query}
-	use doc && use cxx && dohtml -r ccwrap/doxy/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{f,cc}
-	fi
-}
-
-pkg_postinst() {
-	elog "To install data files, you have to run as root:"
-	elog "lhapdf-getdata --dest=${EROOT%/}/usr/share/lhapdf/PDFsets --all"
-}
diff --git a/sci-physics/lhapdf/lhapdf-6.0.4.ebuild b/sci-physics/lhapdf/lhapdf-6.1.0.ebuild
index c3c0d84dddf8..3d521be177aa 100644
--- a/sci-physics/lhapdf/lhapdf-6.0.4.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-6.0.4.ebuild,v 1.2 2013/11/06 05:28:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-6.1.0.ebuild,v 1.1 2014/05/06 16:19:56 bicatali Exp $
 
 EAPI=5
 
@@ -24,8 +24,7 @@ IUSE="doc examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	dev-libs/boost
-	dev-cpp/yaml-cpp
+	dev-libs/boost:0=
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )"
@@ -63,6 +62,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "To install data files, download them into ${EROOT%/}/usr/share/LHAPDF:"
-	elog "http://www.hepforge.org/archive/${PN}/pdfsets/${PV}"
+	elog "Download data files from:"
+	elog "http://www.hepforge.org/archive/${PN}/pdfsets/$(get_version_component_range 1-2 ${PV})"
+	elog "and untar them into ${EROOT%/}/usr/share/LHAPDF"
 }