gentoo resync : 05.04.2019

3 files changed, 5 insertions, 70 deletions

diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index a32d54f2e39b..b960718e96f3 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,7 +1,5 @@
-DIST pybliographer-1.2.15.tar.gz 1859977 BLAKE2B e658f76e7f766beec598d0397f10e7613b8a529d7f1eeccda6364bc93bfb33bb5b9e121b9edcd4bc62dd414bca0ffb4684792baf36228522c9d509c59b0f8833 SHA512 f4b3478f60f042ebc7538f044a8c4014fda5202576e3f894b31c79430400e834c59f859f895efa187a89016f4e2625ee6be20751f31843e179fbdfb54ba65330
 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.15-r1.ebuild 1760 BLAKE2B 054cb5696d5636d3956ceb7a9181219720c61c340f25a5d6cd4d8fcc4c759cf4f4e169cb146aa043360ae5a75c360df085bf5d722f826e9fbf5d7d725283fefb SHA512 5bac364a9fa952a1f0afc7c87d6c99fe6dd0812d1e5eb66a9f23e8b36864be123e09227074f625baa91822c4857b7b894db033a75402b8d90fd16348c05b137e
 EBUILD pybliographer-1.2.18.ebuild 1856 BLAKE2B a8730b705bb5abc370d9f3863d63738998463aa101cab6a252ab9deb71984d8f0aacc788576c6a5f8233711c09978a032975288a483b9724dc437043ca74289b SHA512 47e3d3422c29aa13f90c531337f365780fb4c4522b46010789df593f47c525a4bb4feafafd66816c9697ad28857db92449f34daee4e8b59eac750531c5130adc
-EBUILD pybliographer-1.4.0.ebuild 1517 BLAKE2B dcca32933c7a28c785506fd74a7f1b18a5b8a7df56149908d5b4c8e5a86b22b3ecaafe912c71f7aaeff2a6a0809a8f7eb6e16867e22daf5425b00085705e9c59 SHA512 d5829d2f6b354fca3badb440d6e43013bf8ae35a510a5842f63f024288733be2558f19027de16c81e585f6ce44b3c2d1aad71aaf693777497689061f2ab69558
+EBUILD pybliographer-1.4.0-r1.ebuild 1720 BLAKE2B 5db94a1a7964734adbb6a9ad445dd08f03288dade28949c30c98b1cf138ef27fe1b2b8a36cee7741e62f27b7712d9d7a49786a53fc55b53181a7554099317159 SHA512 6e9ab54717cee822df5080190bcb3e1e729bddbacc5dbf372738b0a8322d8402272eeeb956fa3b12c0c50727f3fcd57682e8c11147e0def48e93a4b9cfd40939
 MISC metadata.xml 798 BLAKE2B 186a835eadc561bbb17ce369742b5c4d27ce31b3de5ee5d3e2d4ec8c81dee3e96c8c3c86c50fc3d77136738551f74f9346825a754ab4401d6c212057ebd73a76 SHA512 9719f3d541a00da1445210482b9b4f6cfc104b59629b472e50ca2869bdaed6f3a3cf7ff1e28b06806407db368c6c998d46c1e22919f4e4c6cafa9dca1808c2b1
diff --git a/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild b/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild
deleted file mode 100644
index de628cb4c896..000000000000
--- a/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-GCONF_DEBUG="no"
-
-inherit autotools 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/gnome-doc-utils
-"
-
-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
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-depchecks
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/app-office/pybliographer/pybliographer-1.4.0.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild
index 7d98069e9ff8..024230289097 100644
--- a/app-office/pybliographer/pybliographer-1.4.0.ebuild
+++ b/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild
@@ -43,7 +43,8 @@ src_prepare() {
 	# 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:\@datapyb@:$(python_get_sitedir)/${PN}:" pybliographer.in || die
+	sed -i -e 's:prefix=:cd @datapyb@ \&\& prefix=:' scripts/pybscript.in || die
+	sed -i -e "s:\@datapyb@:$(python_get_sitedir)/${PN}:g" pybliographer.in scripts/pybscript.in || die
 	sed -i \
 		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
 		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
@@ -59,4 +60,6 @@ src_configure() {
 src_install() {
 	gnome2_src_install
 	python_fix_shebang "${D}"
+	dodir /usr/share/${PN}
+	mv "${ED}/$(python_get_sitedir)/${PN}/pixmaps" "${ED}"/usr/share/${PN} || die
 }