gentoo resync : 25.08.2020

4 files changed, 3 insertions, 112 deletions

diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 7d9e363909d7..61a1f0cdc80f 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,10 +1,3 @@
-DIST CT10.LHgrid 21081519 BLAKE2B 29d984a010405de5537d27eca81a306ea4dfc13b554d96031a087cdb9105ce65d736ef6e65f5a1ed3121ad22a6e0bc855ad5a16905b10e214405d9fcc8b39ae5 SHA512 4196b0899dc7f5803608d9328872b942393d5f5103e8d50a53b35af6f8bac509adbbe83c363ab33a5fbfab3c33156e8ae46131939ad5a8642c558ff209630820
 DIST LHAPDF-6.2.3.tar.gz 750659 BLAKE2B a16f67c69f41e96cdb5434cc53658c6b085b94c9ad06443fdfb49aa1de50eeb2a59aa41442a032c29b361bad4f749cef42499f3d16f2774efb0b399f889576e4 SHA512 167064a141f46e5c834d950690a989330b940acec62377b8b4c40e14665503cf7b4ddb79e05c71ebe1f801231192d951e294bec3944ec37b2bca484b2e5ce894
-DIST MRST2004nlo.LHgrid 288040 BLAKE2B b568b94905370faa30bbb8ad5ae9b8ee0938fb1373c19ca823662e6f7c930d251734d4afa72c8679b06356999b36bfd828749cbc9dc86a493a1764cb07cf0871 SHA512 b554454fa494c86a3ae56168c3d74c5e3c3bd80f10b393153c0adfbb39a3f3837ae2db80534d288784409154034187c9c5212dfc9c21ed1bf32ef89b9266e262
-DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
-DIST cteq61.LHgrid 8946864 BLAKE2B aa7d7d817082a70fb53cf9c9d367af3bca9b5f4d845ee6c8f8b77265541980cab6f6ffc74a2233ef2899c161f9171cb3e7ba9570a57c5ed048311622217f8e89 SHA512 ab35c058f1ece8b428d8664ba2e14068541279328b5eb9e13b020642cc804c21f7412414dd74bb3621a5136bfa7d9a60832604c944d1e3519c5a94d3dce2a063
-DIST cteq61.LHpdf 11860 BLAKE2B cde2c5f6493977f56207d86f0a439a192e32f4debe50b6399b10cf59982bf944950c53c05e97a56daa8eb8e2ebf91a38fe405b1d423be7839c41dab61150b2e2 SHA512 2769bcaed94aa4b47144cd2c3ce76e0b6ab4fa8af278db5cb3b612f2286200352e829eec3971c8da0b78144483f00bbbf1ae2aae8d1e75045d239fab40289bc0
-DIST lhapdf-5.9.1.tar.gz 1236188 BLAKE2B a70b0421f1eefb79e239beed362858f0a47f27eebb0bf30c8f71f0fd49e405370774a932388c56b9193d51be14d7ad8e00efb7ea947e92009f23868b28ced67f SHA512 8e0eafa202d7c486264c06ddac31a2d1fc17c71223cf5b75cd9dae7e434792e8b8f4002bc8a0d00491c0c3fc58513095cbf693dc883c3bf968473a4e6232586a
-EBUILD lhapdf-5.9.1.ebuild 2568 BLAKE2B b524737e97a5e885f367d6c401a5e959e0b866f6c115156d568d96250c2d620bb26df6a75140405882feeeaac5eefa87de4dd529e1fb74516e7e10bcdae640ec SHA512 f5dece0e617f2750e3c7e0db47fdfad9e2b5a1a490c285094835de1af7b9f62f5cada0a5ef4d46a9ced8de7342d137551de706b3b6ea1d88278dd29671157f69
-EBUILD lhapdf-6.2.3.ebuild 1605 BLAKE2B b6ef8f78ae33a595cf508030c2804aa7932ab57cef2c9cd791805df295a35c09b5ab348ca27214fdc9a39fa1dad9fbd824b7449cf1c666c6e761e9ed9b36df8c SHA512 60ad1fb4db61bfae6eacaadcc148bb405dfb65dc619b5224cc3132f4b552c151fb72f1e3c4b3906e1acd1bc27e79d762119db7cf91f62c4c90a936aa91798337
-MISC metadata.xml 1090 BLAKE2B e7faa55de10391c76cc33d1f66f9a715d163d396c5e74b4d2d55268424abb74dc70687287c900841e4a298ca5bc936b01cec7c570d2b14b86d251c4b3d485d26 SHA512 fe04ac08f3f0b7ed98369d16b2cdf053d980211f3d4bb9a17d3e3feb3cc3dc6e2999fd16cc533ba7250e47b258aa10bed90d7f62007faac064112c5f9b79fe4e
+EBUILD lhapdf-6.2.3.ebuild 1603 BLAKE2B a10b72c02b6f9ea491908d1520bebdf4a6073c7ed61c64e8379e1db7e042a42e00317060e70fbf7e529cb9c48374022eb15786fbd06a80124a055fdab7d1d701 SHA512 f9be54595fe9e98fcc2bcef349edf651e40b30f8ab6d0dce0422747a0154e77bcfe619619e10a8506a801936744268c64eea6d57db91c54f309262f7ab0ed127
+MISC metadata.xml 996 BLAKE2B 97df1e778a0e4fdd20faeffcc992c5c76d203c35f9916a15c823bd10d8914cea7b2b6c7b58cca1e6af50ff4a134db8c5cf40db345520cd6f4d16a58d02fda822 SHA512 0c5f089f8428dfbf3e6151f2d9052409dbf7dc64af40fe28664df3e6ba014c8ec4c3e6ae2958c0f0b13ee7edc59f038dab14272622119cc5cb5d6f7fc43637cc
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 dee35d6e6f2f..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-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://lhapdf.hepforge.org/svn/pdfsets/5/CT10.LHgrid
-		http://lhapdf.hepforge.org/svn/pdfsets/5/cteq61.LHgrid
-		http://lhapdf.hepforge.org/svn/pdfsets/5/MRST2004nlo.LHgrid
-		http://lhapdf.hepforge.org/svn/pdfsets/5/cteq61.LHpdf
-		octave? ( http://lhapdf.hepforge.org/svn/pdfsets/5/cteq5l.LHgrid ) )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cxx doc examples octave python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	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 myconf="--enable-ccwrap"
-	! use octave && ! use cxx && myconf="--disable-ccwrap"
-	econf \
-		$(use_enable cxx old-ccwrap ) \
-		$(use_enable octave) \
-		$(use_enable python pyext) \
-		$(use_enable doc doxygen) \
-		${myconf}
-}
-
-src_test() {
-	# need to make a bogus link for octave test
-	if use octave; then
-		# remove line that tries to read non-existent help file
-		sed -i -e '/help/d' octave/lhapdf-octave-example1.m \
-		|| die 'sed octave example failed'
-	fi
-	ln -s "${DISTDIR}" PDFsets
-	LHAPATH="${PWD}/PDFsets" \
-		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
-		emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README TODO AUTHORS ChangeLog
-
-	# leftover
-	rm -rf "${D}"/usr/share/${PN}/doc || die
-	if use doc && use cxx; then
-		# default doc install buggy
-		insinto /usr/share/doc/${PF}
-		doins -r ccwrap/doxy/html
-	fi
-	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 "${ROOT}usr/bin/lhapdf-getdata --dest=${ROOT}usr/share/lhapdf/PDFsets --all"
-}
-
-pkg_postrm() {
-	if [ -d "${ROOT}usr/share/lhapdf" ]; then
-		ewarn "The data directory has not been removed, probably because"
-		ewarn "you still have installed data files."
-	fi
-}
diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
index fd7abda37ad3..4b3de592bb3f 100644
--- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-physics/lhapdf/metadata.xml b/sci-physics/lhapdf/metadata.xml
index e1748d9c6923..8ce35ee2a26c 100644
--- a/sci-physics/lhapdf/metadata.xml
+++ b/sci-physics/lhapdf/metadata.xml
@@ -18,7 +18,4 @@
   version 4.1 onwards a configuration script facilitates the
   installation of LHAPDF.
 </longdescription>
-<use>
-  <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag> 
-</use>
 </pkgmetadata>