Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

5 files changed, 89 insertions, 6 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 01791298ce94..27ec0b73cc9d 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index 48b20ac7e534..a32d54f2e39b 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,5 +1,7 @@
+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
 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
new file mode 100644
index 000000000000..de628cb4c896
--- /dev/null
+++ b/app-office/pybliographer/pybliographer-1.2.15-r1.ebuild
@@ -0,0 +1,66 @@
+# 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/wps-office/Manifest b/app-office/wps-office/Manifest
index 6cfee58a8b8e..43e748f16dde 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,4 @@
-DIST wps-office_10.1.0.6758_x86.tar.xz 134090056 BLAKE2B b137774b23c947cf81e3c3b4bdde105285c415ae18c14ed6e11ab72d10287ec7129b63c17c73494c146da94d5df0c266f7bc4b7490f6740ff0cb89c99d89f2d2 SHA512 ed1a59e3abfdda71025eacfd6eb6f699459ce815894232ca6205990f4de5cb7a51c958a354edb01b6411ffba691aa03c839720f156ea467c018e005dcc795d75
-DIST wps-office_10.1.0.6758_x86_64.tar.xz 131332480 BLAKE2B 030474fe48d392f6b8d00da19b8be97e5e19414cac64567c563d6dfc79a89e40ef7cdf0551219bada63661a69aa23ba3bfa8a808d41d0fa6f4c61e61b0871678 SHA512 2e1510d79119a4950437023ec34199e3e6e5ddc43e655af0cc0993758f640887395771ca27a4eec1bb9e81788738221d135d652feda988b6a3194090229c9cfd
-EBUILD wps-office-10.1.0.6758.ebuild 2150 BLAKE2B d04a941bb18e5aa1551f253881dd990ae13ed50d7b6b8cdde6c64787c3b4dabef67895620c4fc211bc1b69e49096cafc244a1aaf7f91e65322f725f6b6dd9394 SHA512 1e94128bf7843c66ebb06602f7d47e3e8f5d66aceef6b631cd2839cc8ad2d36dc7cf49576bc9e75fa3e0b1a614aa6221bdab0c7a176f6b5946ec3ccd8a954d4c
+DIST wps-office_10.1.0.6757_x86.tar.xz 134095644 BLAKE2B ad44db7aa752055b59a52870041aa4c16d146e3068a8d95c8939efcc979a514a3ae6fcde1bca5eb90833c47c051295722e547316337c5f56727252cae133b994 SHA512 ba5001f0fd2a605c3688084d34aa293a728ac46d52379cea6db8c5232c4331e60476d5845087002071f89ec9d8bdf7c020222b4aaff780736eaeff5a273f40ee
+DIST wps-office_10.1.0.6757_x86_64.tar.xz 131336404 BLAKE2B dfaa30f643d9fb08db711cd4ddec76ad3c10bc5435f4c6a2b245b9232059a22f918364e585c9a9551612ee10eff1535a44b5f300a8863f39d4cabb2f7c76b467 SHA512 5f9f88cc9795a317267531cb1cd260d86e1613dc5eef34005eaa58dd8ac0715ce3ba1da60ee83c617cb16d759b0da9274963f8a4fb4a86c4890eca0565af9c62
+EBUILD wps-office-10.1.0.6757.ebuild 2358 BLAKE2B 4f7d0e48f56025adfa7b8b1b79806cb1a4fa57a57e15efcc397b33985b27707f48bfdca811e75aae72b5d9bb513cf6c97b0a23706cdbe4e08b8aa92b1452064c SHA512 bfec3ffabd76717950b4a1a1c09c892ca22a95fc6c8f54a7bbfc3440b07783accdc95303901e3847b179c9790400f7e527fb83327169ed51c81a896f1bb71d5c
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-10.1.0.6758.ebuild b/app-office/wps-office/wps-office-10.1.0.6757.ebuild
index 4859d63427b3..2480067ec603 100644
--- a/app-office/wps-office/wps-office-10.1.0.6758.ebuild
+++ b/app-office/wps-office/wps-office-10.1.0.6757.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit xdg
+EAPI=6
+inherit eapi7-ver gnome2-utils xdg
 
 MY_PV="$(ver_cut 4)"
 
@@ -100,3 +100,18 @@ src_install() {
 
 	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
 }
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}