1 |
floppym 13/03/30 09:33:53 |
2 |
|
3 |
Modified: systemd-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Move hwids to PDEPEND. Call udevadm to update the hwdb in pkg_postinst. Copied from the udev package. |
6 |
|
7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.34 sys-apps/systemd/systemd-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.34&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.34&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.33&r2=1.34 |
15 |
|
16 |
Index: systemd-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v |
19 |
retrieving revision 1.33 |
20 |
retrieving revision 1.34 |
21 |
diff -u -r1.33 -r1.34 |
22 |
--- systemd-9999.ebuild 29 Mar 2013 15:49:38 -0000 1.33 |
23 |
+++ systemd-9999.ebuild 30 Mar 2013 09:33:53 -0000 1.34 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.33 2013/03/29 15:49:38 mgorny Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.34 2013/03/30 09:33:53 floppym Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
@@ -50,7 +50,6 @@ |
33 |
# baselayout-2.2 has /run |
34 |
RDEPEND="${COMMON_DEPEND} |
35 |
>=sys-apps/baselayout-2.2 |
36 |
- >=sys-apps/hwids-20130309-r1[udev] |
37 |
|| ( |
38 |
>=sys-apps/util-linux-2.22 |
39 |
<sys-apps/sysvinit-2.88-r4 |
40 |
@@ -59,6 +58,8 @@ |
41 |
!<sys-libs/glibc-2.10 |
42 |
!sys-fs/udev" |
43 |
|
44 |
+PDEPEND=">=sys-apps/hwids-20130309-r1[udev]" |
45 |
+ |
46 |
# sys-fs/quota is necessary to store correct paths in unit files |
47 |
DEPEND="${COMMON_DEPEND} |
48 |
app-arch/xz-utils |
49 |
@@ -232,6 +233,12 @@ |
50 |
fi |
51 |
systemd_update_catalog |
52 |
|
53 |
+ # Keep this here in case the database format changes so it gets updated |
54 |
+ # when required. Despite that this file is owned by sys-apps/hwids. |
55 |
+ if use hwdb && has_version "sys-apps/hwids[udev]"; then |
56 |
+ udevadm hwdb --update --root="${ROOT%/}" |
57 |
+ fi |
58 |
+ |
59 |
if [[ ! -L "${ROOT}"/etc/mtab ]]; then |
60 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
61 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
62 |
|
63 |
|
64 |
|
65 |
1.106 sys-apps/systemd/ChangeLog |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.106&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.106&content-type=text/plain |
69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.105&r2=1.106 |
70 |
|
71 |
Index: ChangeLog |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
74 |
retrieving revision 1.105 |
75 |
retrieving revision 1.106 |
76 |
diff -u -r1.105 -r1.106 |
77 |
--- ChangeLog 29 Mar 2013 15:52:24 -0000 1.105 |
78 |
+++ ChangeLog 30 Mar 2013 09:33:53 -0000 1.106 |
79 |
@@ -1,6 +1,10 @@ |
80 |
# ChangeLog for sys-apps/systemd |
81 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
82 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.105 2013/03/29 15:52:24 mgorny Exp $ |
83 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.106 2013/03/30 09:33:53 floppym Exp $ |
84 |
+ |
85 |
+ 30 Mar 2013; Mike Gilbert <floppym@g.o> systemd-9999.ebuild: |
86 |
+ Move hwids to PDEPEND. Call udevadm to update the hwdb in pkg_postinst. Copied |
87 |
+ from the udev package. |
88 |
|
89 |
29 Mar 2013; Michał Górny <mgorny@g.o> -systemd-199.ebuild: |
90 |
Drop the unnecessary mid-version. |