From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2018C138370 for ; Tue, 8 Jan 2013 16:45:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7F7121C0B5; Tue, 8 Jan 2013 16:45:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AA9E21C0B5 for ; Tue, 8 Jan 2013 16:45:02 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D16A533BF20 for ; Tue, 8 Jan 2013 16:45:00 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 96A542171D; Tue, 8 Jan 2013 16:44:59 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: systemd-9999.ebuild ChangeLog X-VCS-Directories: sys-apps/systemd X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130108164459.96A542171D@flycatcher.gentoo.org> Date: Tue, 8 Jan 2013 16:44:59 +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: 1061cbf2-8d40-4701-874a-96c6f05f98f7 X-Archives-Hash: 28a0a88f1e35fc66aa81b484f9fc8f05 mgorny 13/01/08 16:44:59 Modified: systemd-9999.ebuild ChangeLog Log: Update the journald catalogs when rebuilding systemd. (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) Revision Changes Path 1.3 sys-apps/systemd/systemd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.2&r2=1.3 Index: systemd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- systemd-9999.ebuild 17 Dec 2012 00:36:00 -0000 1.2 +++ systemd-9999.ebuild 8 Jan 2013 16:44:59 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.2 2012/12/17 00:36:00 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.3 2013/01/08 16:44:59 mgorny Exp $ EAPI=5 @@ -205,6 +205,8 @@ } pkg_postinst() { + systemd_update_catalog + mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble." if [[ ! -L "${ROOT}"/etc/mtab ]]; then ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." @@ -230,3 +232,10 @@ ewarn " init=/sbin/init" ewarn "to your kernel to boot using sysvinit / OpenRC." } + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} 1.66 sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.66&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.66&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.65&r2=1.66 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- ChangeLog 17 Dec 2012 00:36:00 -0000 1.65 +++ ChangeLog 8 Jan 2013 16:44:59 -0000 1.66 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/systemd -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.65 2012/12/17 00:36:00 mgorny Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.66 2013/01/08 16:44:59 mgorny Exp $ + + 08 Jan 2013; Michał Górny systemd-9999.ebuild: + Update the journald catalogs when rebuilding systemd. 17 Dec 2012; Michał Górny systemd-196.ebuild, systemd-9999.ebuild: