gentoo resync : 31.05.2021

4 files changed, 9 insertions, 24 deletions

diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 30d08d3cd8ea..d7092e9169d3 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,7 +1,7 @@
-AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22521d4af8747943430eeab85f8b3bd9c2b18394ef1b08a0818931e120198c3811fc79d326d4e307f820d5192ebf78e2 SHA512 69281b26c69f5cae1e33f53c58b8a7b383ae83fa8309db03a505e6df3ca018acdf5e4998b42c9d4d1cfda2eaaf36903c1a39211664358506a90cde7e1012ee8d
+AUX libint-1.1.6-as-needed.patch 1982 BLAKE2B ee6fdcd80c2ba8e9b40b3a25aecdd3dced861b2b0a0b6abd535266cce23a35b41e7a6bb65e35cf994b9cf37e2e94ad5910e5f3730e7147250eece28c536c9ced SHA512 6677550cae8aca9cd7905594e1c229e16057e3efa4c1b96e4f03586d694189bc5c8121884397b9d618300f05dc9c86fad3c0c82bb701bf82f6e07613ac9e8c5b
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
-EBUILD libint-1.1.6.ebuild 874 BLAKE2B 334ebcd9d4a9a076197af69a0ce563173ba550917c4edb5427010355873716d2210d46e978e97078926cf280914129ff61fdf8d399f743d182bad68145cdb542 SHA512 0a8a04f2416c199d9c346d02cd11011cf3558f04d9c141a67b073cd9ecf2b77cace9ff8eda1b3a6e611a018ad235e5febd6a62e2d1a809444952a191c2f20210
+EBUILD libint-1.1.6.ebuild 855 BLAKE2B 65e5b86aa9e9b8a29825c7075145b4ad170c9a6bd255773e605a826476a54e3ec4734194362a53d74c95b3916e98ab7343ac5b94f4defb2a6cad0c42c55077a0 SHA512 ec5cc40c2c27cf812cca7d843461e5568f2596970ef80912e3c8cfab2cc70b0a5179c680c63a7d8df84d8d38bfd3e43dfad035ac4b43bf587ef81738d0e84274
 EBUILD libint-2.6.0-r2.ebuild 1419 BLAKE2B 97eb79e76322556df6ce310dacf96024dfcc0ced9e59bcd287510cecae07d04e4cc4137c0b95759c1ae9d4e9755ad97ffb5d3aeca5206d8fe90b4197cc89d769 SHA512 84ae51c30ec02658cdf30e609f3ab7ec5c37e8120fbf8c07f15efa6b407e653a42f3cd563f4edf1b2dfde52c2b152db5199723cbd3b73a7e79f40339444c64c9
-EBUILD libint-2.6.0-r4.ebuild 1527 BLAKE2B 6c0e8ddd9c88f4524e9647fc44a13589013b426896e5325cd7c179dcbee2c2289b9281a205c455f32f5867e9976fba4ac7e13c71e2dad94fe8cff806ca29e90c SHA512 7aa9c96bfa2166579e48bd548bba4b8d72f4c4a6f28d79942dbaf2b3d87317ef9dd33aa779611a2d9cf3758eb74993363d42a1a16758fc6ebe4ba2d5c82845c3
+EBUILD libint-2.6.0-r4.ebuild 1596 BLAKE2B 14d5d25ae9618ada2fc3ea6ef3ec57afe518b82723c1352db88041d33ed14c96fd8bf5d8e4d58aaebade03d0ffab990b0d70d9e40b3e61fe74b0c50577f30af4 SHA512 e8fc69b0ded3b2bdb33e3a2af6cf9c6f763d0fe63ab2364b05577dc424ce40d1ba68ba17c54ad2576a888d5ab8072ebe1f304044e473220f1764c9ce888330e5
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/files/libint-1.1.6-as-needed.patch b/sci-libs/libint/files/libint-1.1.6-as-needed.patch
index c48505314b39..d9f6e449ba08 100644
--- a/sci-libs/libint/files/libint-1.1.6-as-needed.patch
+++ b/sci-libs/libint/files/libint-1.1.6-as-needed.patch
@@ -1,12 +1,3 @@
- configure.ac                      | 3 +--
- src/bin/MakeRules.in              | 2 +-
- src/lib/libderiv/Makefile.library | 2 +-
- src/lib/libint/Makefile.library   | 2 +-
- src/lib/libr12/Makefile.library   | 2 +-
- 5 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dc86e88..8cc3aac 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -317,12 +317,11 @@ LIBS=$withval
@@ -23,8 +14,6 @@ index dc86e88..8cc3aac 100644
  echo Using extra library directories: $withval
  )
  
-diff --git a/src/bin/MakeRules.in b/src/bin/MakeRules.in
-index 5b90607..8ea5005 100644
 --- a/src/bin/MakeRules.in
 +++ b/src/bin/MakeRules.in
 @@ -3,7 +3,7 @@ HAVE_MAKERULES = yes
@@ -36,8 +25,6 @@ index 5b90607..8ea5005 100644
  
  .PHONY: install install_inc install_target uninstall clean oclean distclean targetclean realclean
  install::
-diff --git a/src/lib/libderiv/Makefile.library b/src/lib/libderiv/Makefile.library
-index ee152ef..8debfe8 100644
 --- a/src/lib/libderiv/Makefile.library
 +++ b/src/lib/libderiv/Makefile.library
 @@ -23,7 +23,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
@@ -49,8 +36,6 @@ index ee152ef..8debfe8 100644
  
  $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
  	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
-diff --git a/src/lib/libint/Makefile.library b/src/lib/libint/Makefile.library
-index 23e2918..01c4225 100644
 --- a/src/lib/libint/Makefile.library
 +++ b/src/lib/libint/Makefile.library
 @@ -41,7 +41,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
@@ -62,8 +47,6 @@ index 23e2918..01c4225 100644
  
  $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
  	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
-diff --git a/src/lib/libr12/Makefile.library b/src/lib/libr12/Makefile.library
-index 1510807..26d47a4 100644
 --- a/src/lib/libr12/Makefile.library
 +++ b/src/lib/libr12/Makefile.library
 @@ -47,7 +47,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild
index f3a93eaaacdf..1abdfd1fd795 100644
--- a/sci-libs/libint/libint-1.1.6.ebuild
+++ b/sci-libs/libint/libint-1.1.6.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=7
 
-MY_PV="$(ver_rs 0- -)"
 inherit autotools fortran-2 toolchain-funcs
 
+MY_PV="$(ver_rs 0- -)"
+
 DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
 HOMEPAGE="https://github.com/evaleev/libint"
 SRC_URI="https://github.com/evaleev/libint/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-release-${MY_PV}"
 
 PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
diff --git a/sci-libs/libint/libint-2.6.0-r4.ebuild b/sci-libs/libint/libint-2.6.0-r4.ebuild
index b8166abf35c6..b112d1144fc2 100644
--- a/sci-libs/libint/libint-2.6.0-r4.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r4.ebuild
@@ -25,6 +25,9 @@ DEPEND="
 src_prepare() {
 	default
 	eautoreconf
+
+	# bug 725454
+	sed -i -e '/RANLIB/d' src/bin/libint/Makefile || die
 }
 
 src_configure() {