Skip to content

Commit

Permalink
app-i18n/canna: remove pkg_prerm and pkg_postrm
Browse files Browse the repository at this point in the history
Gentoo-Bug: 328693

Package-Manager: Portage-2.3.6, Repoman-2.3.1
  • Loading branch information
hattya committed Jul 8, 2017
1 parent 17c6f81 commit 98fc3da
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 49 deletions.
26 changes: 1 addition & 25 deletions app-i18n/canna/canna-3.7_p3-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,7 +19,6 @@ DEPEND=">=sys-apps/sed-4
x11-misc/gccmakedep
x11-misc/imake"
RDEPEND=""

S="${WORKDIR}/${MY_P}"

src_unpack() {
Expand Down Expand Up @@ -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
}
24 changes: 0 additions & 24 deletions app-i18n/canna/canna-3.7_p3-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ DEPEND=">=sys-apps/sed-4
dev-texlive/texlive-latexrecommended
)"
RDEPEND=""

S="${WORKDIR}/${MY_P}"

src_unpack() {
Expand Down Expand Up @@ -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
}

0 comments on commit 98fc3da

Please sign in to comment.