gentoo resync : 15.12.2019

3 files changed, 5 insertions, 66 deletions

diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
index 61f2fc032061..6477058637a4 100644
--- a/sci-astronomy/pyephem/Manifest
+++ b/sci-astronomy/pyephem/Manifest
@@ -1,5 +1,3 @@
-DIST pyephem-3.7.5.3.tar.gz 735112 BLAKE2B 0edac4210c6ab745e64641d21f053fbd67a6e3841d1eb6b3b06bd5d4fcff0b6a1e1dc1634d8608e990eb6e588d030cc6a67115ebfd7bbefeb8f5ce219ae3ca1b SHA512 a61b6a19c35c10ee9d4eba72cb0e6b9446076a3943be58dfd5e084bc9ab09dc70f2ee335ba5f0ef9d9d4d34a461bf4b9ddd57dae50d2e8a8f565d411e47f2908
 DIST pyephem-3.7.6.0.tar.gz 739561 BLAKE2B a8129632514940e6d786dcc50d2dd0bd1fff2b76b9d59f88820c93cce3400f9b15c4f7418bc778ee5ad60a8909a970aaea5df62c5192fcb71f822b97abc0dc4f SHA512 c3013ef943c0e1e2c30bba6f72912efb100b4c8c45904b7d6d7ba73d8b741564793a6e538117eb88abb824c93c874e2c955de734418ebd2370888718a149c9a8
-EBUILD pyephem-3.7.5.3.ebuild 1137 BLAKE2B 865f6781a66f8029ccb5626b519e029ca1c7cd365d52168e024bfb1c3dc01fc196ddd57811c04aa337732d8f2e18c52ba888dac8f001421d181ef7d91104bbe6 SHA512 ade529d1ca79fdf499d1236c74eebe40a1feaa656afbd500715075b36adf3463816bc3b4631c2ce4462cf1c309748839bdc3003f10c4e256ead732513b423796
-EBUILD pyephem-3.7.6.0.ebuild 1153 BLAKE2B 29bbe84c0de0c81adb2ab13f37b6733213e761464868dfaa6c6fbdbfc2f7b0652e2cf86fe466e30080b2a14b664ce2a56b6bd1b593d392e6a6658e7783d9b48b SHA512 21ad764bfa9b60699d089b01519dd7b4edaf7c779544c8865bacd2dfcd0ec02e611ae23b4dea183fb3b1ae19cc138e3b48eb3be40d74a2a220d4ad602ac896ff
+EBUILD pyephem-3.7.6.0-r1.ebuild 1031 BLAKE2B e796c1a5fae20473dba9828777650de19219ed6381b348027a780db2430676044bbac0ffda7e6dca24a6567d42934e646d6510584a7df6649bdaacc8fd1b0998 SHA512 ecfd3e490b7751298f9a4e575d50f7181f27bc6d423ca968d1d87cf98560e5b5d8dd277cd72cb22406aa7a0ff44bde5b34d433a3bc8113e0015cb45dc992ffcb
 MISC metadata.xml 947 BLAKE2B 0e586f2e978bb31b9ca757d2192a41e5a6e3414c7c29ceabddfb0ace9c9eb31ade32424701a9370665d69dd7cbeba567cdc9288cada621eb1d66b5a8a680c36d SHA512 f41c27b07f211b09dd72e316d02c46206dea0ff368e2ad1a8d116df49a2ce2a74137b2647572e295bcde34792d4ee15fb2d3f9e1a883c6cb306f6ef2a43d5c53
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
deleted file mode 100644
index 31682fca98a7..000000000000
--- a/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Astronomical routines for the python programming language"
-HOMEPAGE="https://rhodesmill.org/pyephem/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="
-	doc? ( dev-python/sphinx )"
-RDEPEND=""
-
-src_prepare() {
-	# don't install rst files
-	sed -i -e "s:'doc/\*\.rst',::" setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	if use doc; then
-		PYTHONPATH=. emake -C ephem/doc html
-	fi
-}
-
-python_test() {
-	if [[ ${PYTHON_ABI} == "2.7" ]]; then
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			${EPYTHON} -m unittest discover -s src/ephem
-	else
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			unit2 discover -s src/ephem
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	use doc && dohtml -r ephem/doc/_build/html/*
-
-	delete_tests() {
-		rm -r "${D}$(python_get_sitedir)/ephem/tests" || die
-	}
-	python_foreach_impl delete_tests
-}
diff --git a/sci-astronomy/pyephem/pyephem-3.7.6.0.ebuild b/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild
index 8dcbafee4f8d..b1e5535c3234 100644
--- a/sci-astronomy/pyephem/pyephem-3.7.6.0.ebuild
+++ b/sci-astronomy/pyephem/pyephem-3.7.6.0-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Astronomical routines for the python programming language"
@@ -19,6 +18,8 @@ IUSE="doc test"
 DEPEND="doc? ( dev-python/sphinx )"
 RDEPEND=""
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	# don't install rst files by dfefault
 	sed -i -e "s:'doc/\*\.rst',::" setup.py || die
@@ -33,13 +34,7 @@ src_compile() {
 }
 
 python_test() {
-	if [[ ${PYTHON_ABI} == "2.7" ]]; then
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			${EPYTHON} -m unittest discover -s ephem
-	else
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
-			unit2 discover -s ephem
-	fi
+	PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" unit2 discover -s ephem
 }
 
 src_install() {