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 AC1AA139694 for ; Sat, 8 Jul 2017 06:50:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0A2423403D; Sat, 8 Jul 2017 06:50:25 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AAE7F23403D for ; Sat, 8 Jul 2017 06:50:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 13B5B3417B1 for ; Sat, 8 Jul 2017 06:50:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7820C7490 for ; Sat, 8 Jul 2017 06:50:22 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1499496599.98fc3da5328a90e90d93fe6fddd3aec964f579c0.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/canna/canna-3.7_p3-r1.ebuild app-i18n/canna/canna-3.7_p3-r2.ebuild X-VCS-Directories: app-i18n/canna/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 98fc3da5328a90e90d93fe6fddd3aec964f579c0 X-VCS-Branch: master Date: Sat, 8 Jul 2017 06:50:22 +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: 435b816b-b325-4674-9b3a-e241eca26b5b X-Archives-Hash: de4d98eab65afe6311c53d52c656577d commit: 98fc3da5328a90e90d93fe6fddd3aec964f579c0 Author: Akinori Hattori gentoo org> AuthorDate: Sat Jul 8 06:49:59 2017 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sat Jul 8 06:49:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fc3da5 app-i18n/canna: remove pkg_prerm and pkg_postrm Gentoo-Bug: 328693 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/canna/canna-3.7_p3-r1.ebuild | 26 +------------------------- app-i18n/canna/canna-3.7_p3-r2.ebuild | 24 ------------------------ 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild index 1153ee9dc23..51effafc6b7 100644 --- a/app-i18n/canna/canna-3.7_p3-r1.ebuild +++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit cannadic eutils multilib @@ -19,7 +19,6 @@ DEPEND=">=sys-apps/sed-4 x11-misc/gccmakedep x11-misc/imake" RDEPEND="" - S="${WORKDIR}/${MY_P}" src_unpack() { @@ -118,26 +117,3 @@ pkg_postinst() { elog "You should rebuild app-dict/canna-* after emerge." elog } - -pkg_prerm() { - if [ -S /tmp/.iroha_unix/IROHA ] ; then - # make sure cannaserver get stopped because otherwise - # we cannot stop it with /etc/init.d after emerge -C canna - einfo - einfo "Stopping Canna for safe unmerge" - einfo - /etc/init.d/canna stop - touch "${T}"/canna.cookie - fi -} - -pkg_postrm() { - if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then - #update-cannadic-dir - einfo - einfo "Restarting Canna" - einfo - /etc/init.d/canna start - rm -f "${T}"/canna.cookie - fi -} diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild index 1f4b241bce4..0f222e9dac2 100644 --- a/app-i18n/canna/canna-3.7_p3-r2.ebuild +++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild @@ -26,7 +26,6 @@ DEPEND=">=sys-apps/sed-4 dev-texlive/texlive-latexrecommended )" RDEPEND="" - S="${WORKDIR}/${MY_P}" src_unpack() { @@ -141,26 +140,3 @@ pkg_postinst() { elog fi } - -pkg_prerm() { - if [ -S /tmp/.iroha_unix/IROHA ] ; then - # make sure cannaserver get stopped because otherwise - # we cannot stop it with /etc/init.d after emerge -C canna - einfo - einfo "Stopping Canna for safe unmerge" - einfo - /etc/init.d/canna stop - touch "${T}"/canna.cookie - fi -} - -pkg_postrm() { - if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then - #update-cannadic-dir - einfo - einfo "Restarting Canna" - einfo - /etc/init.d/canna start - rm -f "${T}"/canna.cookie - fi -}