From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D01C61382C5 for ; Wed, 18 Apr 2018 16:44:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C86C4E08A2; Wed, 18 Apr 2018 16:44:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1C77E08A2 for ; Wed, 18 Apr 2018 16:44:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4DF5335C77 for ; Wed, 18 Apr 2018 16:44:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94CE0270 for ; Wed, 18 Apr 2018 16:44:29 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1524069845.8271b1e73247e9b715ad4a48ffa365937ad46fc5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/argouml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/argouml/argouml-0.34.ebuild X-VCS-Directories: dev-util/argouml/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8271b1e73247e9b715ad4a48ffa365937ad46fc5 X-VCS-Branch: master Date: Wed, 18 Apr 2018 16:44:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1a0ae511-a91e-4bdf-9873-fc5d75c63de1 X-Archives-Hash: c96532be67fff14b66870870e22ab5c7 commit: 8271b1e73247e9b715ad4a48ffa365937ad46fc5 Author: David Seifert gentoo org> AuthorDate: Wed Apr 18 12:16:17 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Apr 18 16:44:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8271b1e7 dev-util/argouml: Port to EAPI 6 Closes: https://bugs.gentoo.org/652796 Package-Manager: Portage-2.3.29, Repoman-2.3.9 dev-util/argouml/argouml-0.34.ebuild | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dev-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild index 96dd77d1ac1..fd031b69ec0 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 }