From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 19 Apr 2018 14:14:48 +0100
Subject: gentoo resync : 19.04.2018

---
 dev-util/argouml/Manifest            |  2 +-
 dev-util/argouml/argouml-0.34.ebuild | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'dev-util/argouml')

diff --git a/dev-util/argouml/Manifest b/dev-util/argouml/Manifest
index ad5a88736edb..5f756823de0c 100644
--- a/dev-util/argouml/Manifest
+++ b/dev-util/argouml/Manifest
@@ -2,5 +2,5 @@ DIST ArgoUML-0.34.tar.gz 16504818 BLAKE2B 9a68d1e48ae16469a91f8ebc44fb0dc5387cfe
 DIST dbuml-module-1.0.4.zip 6231786 BLAKE2B e00e1a87ceed8128b6303b1d38e64c1497fdd8287c4716b15e7dc1f225ca4da67bffa17529b9ed44ff484c3ee057e5dc9096674b152b71df81eb8ffbfec3f5d8 SHA512 a281a8bb8b8422cfceaf704e6b26a0c8b7c8ee393756ebee86ede8a8681b0ba9f8f5b5e568899e6e7b55fba20edba74f9e7a532f647dbf1549f582b3226028b6
 DIST manual-0.34.pdf 3405949 BLAKE2B f52ac83c62a243ca0034237a75d8ce2cdffb7a6668c3562012d4577c742823c092f1d42bba0d1a56ce52885511b3eb6e9a0055cdf0d00baddc2a412964cb8d98 SHA512 1dfaf66485beb82d309a58f3868f7c150575d99d652dbef261991429df85073ffce0cf8d73f44f4f9c13299be3cd11f92826da695901846c7b8dc6561b0090d8
 DIST quickguide-0.34.pdf 58334 BLAKE2B cfd2dd38ac1117ef7253d0193bdf264a0160bf55776b5d1f42efafb9c73924287e12ac2c53bae6e7fd9a6ee29a172e0205909785bbe695ce8b01bc2479c41660 SHA512 0bcdeaa643d400e17b12d92c78eddb33a202220ccb26e5a9933528faa0e8d3fccde432a1fba2103b28bec59d3df75e1176ed2918308533f7e490fbdb5d60a82d
-EBUILD argouml-0.34.ebuild 1343 BLAKE2B b7db08efe5af3a3456bb3548e32f7bf279e776051352b4c5af5e76d30006455c4bf7efab44aa86aa1d8d023af9df2a15e849b9886620c9cce2c7d5cac657e3d2 SHA512 7f137da9b9975dcb229446c859c359cebf4b0575e6442da2f92103fa4a195454d8ae3da6f31877409f14f2ae33b401c87d541dd3a0710c46467e61405f78cd93
+EBUILD argouml-0.34.ebuild 1397 BLAKE2B 723bee8cf0e204c8cc139c20b7cb8367486134b54124fb9587cdf9dd887036555d3fab2642d79f02a140a383245fe11ab6a5aecae252c8715b505c3138462c66 SHA512 c86b36ad663191056060a728b1eb6b299966861de7846b67a410de6db9a7808fd9aa2d259651dedc23aa22a907f62b0a8729f0dc411afafb5dbb7edbf4472a6a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild
index 96dd77d1ac14..fd031b69ec0f 100644
--- a/dev-util/argouml/argouml-0.34.ebuild
+++ b/dev-util/argouml/argouml-0.34.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit eutils fdo-mime java-pkg-2
+inherit desktop xdg-utils java-pkg-2
 
 DESCRIPTION="Modelling tool that helps you do your design using UML"
 HOMEPAGE="http://argouml.tigris.org"
@@ -36,13 +36,17 @@ src_install() {
 
 	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
 
-	dodoc ${P}/README.txt || die
-
-	if use doc ; then
-		dohtml -r release/{Readme.htm,www}
-		insinto /usr/share/doc/${P}
-		doins "${DISTDIR}/manual-${PV}.pdf"
-		doins "${DISTDIR}/quickguide-${PV}.pdf"
+	dodoc ${P}/README.txt
+
+	if use doc; then
+		find release/ \( -name Thumbs.db -o -name filelist.xml \) \
+			-delete || die
+		HTML_DOCS=( release/{Readme.htm,www} )
+		DOCS=(
+			"${DISTDIR}"/manual-${PV}.pdf
+			"${DISTDIR}"/quickguide-${PV}.pdf
+		)
+		einstalldocs
 	fi
 
 	newicon ${P}/icon/ArgoIcon128x128.png ${PN}.png || die
@@ -50,9 +54,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
-- 
cgit v1.2.3