gentoo resync : 06.08.2019

3 files changed, 2 insertions, 73 deletions

diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index eba6f371cd53..c638f8d1a8ed 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,5 +1,3 @@
-DIST pybliographer-1.2.18.tar.gz 2174899 BLAKE2B 4723a01d386a1da6f1de6b730e4e38ef1dedfeb7a72310f40fd7475710fd92236bdb484e102bf93340c8b826ddda0353e143cc741cd6b57acbedd82e40e4181b SHA512 b4a97d7e0aec3b4d7c68169d4d8799911b4da0591e819a67429c45d2b451be6be129214631770cf26f2083a935b55575d35c4f3b11ea74a9b39e55feea376204
 DIST pybliographer-1.4.0.tar.xz 1834356 BLAKE2B ba4892f707c2da3f007cb916b158258a59a41cc631e49deacdd784213d506d8e4286c463afb4148c7cb30ed7084ae1a60eee0e62d1bfe13a26bd9fd70a9e60f8 SHA512 aef50e9815b9ff28618ca72c0b50033a24a1bcaa91c9fdbf3014371bb9b4bcaf8fcdffb0fa38e59d37ccfdb4c1383cd601c73aa2e34f4078c514ae9de7341f2a
-EBUILD pybliographer-1.2.18.ebuild 1856 BLAKE2B a8730b705bb5abc370d9f3863d63738998463aa101cab6a252ab9deb71984d8f0aacc788576c6a5f8233711c09978a032975288a483b9724dc437043ca74289b SHA512 47e3d3422c29aa13f90c531337f365780fb4c4522b46010789df593f47c525a4bb4feafafd66816c9697ad28857db92449f34daee4e8b59eac750531c5130adc
-EBUILD pybliographer-1.4.0-r1.ebuild 1716 BLAKE2B b5dd9ff298e484efb4a3e71779d66263ff42cef1fbcfec4b4db55ccf4358fa87e081e3c5929246679f04229ea9fcb2ca9f8f0aa4fb3c673cd3be6b56b8d15d94 SHA512 5a4d6e5c12b497f52d3d893a7129b5cdb768557fac13a32a09910698713c148171e8cdf74285d046b37965b04196cc218ecb9b5e6ddfb12bfc90a5236ee9ad87
+EBUILD pybliographer-1.4.0-r2.ebuild 1761 BLAKE2B f63d1c712b5e8d6ee7b23b9ef327b0051363cd78711d499329bfef6ae82da650235de21415cc7cdceadc3805f62d61b91916057d1c31211ba9b576eef6708ff9 SHA512 111dcc0ab79067fddef9af9d11ac4fee3a7f47a5ef5c02494233080e7558df9c92778c79f30ee1155a1255097a51494559a5714ea131467b5e823c1a8566638c
 MISC metadata.xml 798 BLAKE2B 186a835eadc561bbb17ce369742b5c4d27ce31b3de5ee5d3e2d4ec8c81dee3e96c8c3c86c50fc3d77136738551f74f9346825a754ab4401d6c212057ebd73a76 SHA512 9719f3d541a00da1445210482b9b4f6cfc104b59629b472e50ca2869bdaed6f3a3cf7ff1e28b06806407db368c6c998d46c1e22919f4e4c6cafa9dca1808c2b1
diff --git a/app-office/pybliographer/pybliographer-1.2.18.ebuild b/app-office/pybliographer/pybliographer-1.2.18.ebuild
deleted file mode 100644
index d70519a480d3..000000000000
--- a/app-office/pybliographer/pybliographer-1.2.18.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
-HOMEPAGE="https://pybliographer.org"
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/recode-3.6-r1
-	app-text/rarian
-	dev-libs/glib:2
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/gnome-vfs-python:2[${PYTHON_USEDEP}]
-	dev-python/libgnome-python:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-"
-
-# Tests broken for a long time, recheck in 1.4, bug #678444
-RESTRICT="test"
-
-src_prepare() {
-	# Workaround for bug 487204.
-	sed -i \
-		-e 's:\$(srcdir)/::g' \
-		tests/Makefile.am || die "sed failed"
-
-	# Install Python modules into site-packages directories.
-	find -name Makefile.am | xargs sed -i \
-		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
-	sed -i \
-		-e "s:\${datadir}/@PACKAGE@:$(python_get_sitedir)/@PACKAGE@:" \
-		etc/installer.in || die "sed failed"
-	sed -i \
-		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
-		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
-
-	# Fix shebang manually as otherwise python_fix_shebang gets confused
-	sed -i -e 's: @python_path@:/usr/bin/python2:' pybliographer.py || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-depchecks \
-		--disable-update-desktop-database
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
index 13679af58184..4cf3e67ada7b 100644
--- a/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild
+++ b/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=app-text/recode-3.6-r1
 	app-text/rarian
 	dev-libs/glib:2
+	dev-python/gconf-python:2[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.24.0:2[${PYTHON_USEDEP}]
 	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]