| 1 |
floppym 13/03/30 09:58:53 |
| 2 |
|
| 3 |
Modified: systemd-9999.ebuild systemd-200.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Copy last two changes from live ebuild. |
| 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.36 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.36&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.36&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.35&r2=1.36 |
| 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.35 |
| 20 |
retrieving revision 1.36 |
| 21 |
diff -u -r1.35 -r1.36 |
| 22 |
--- systemd-9999.ebuild 30 Mar 2013 09:37:50 -0000 1.35 |
| 23 |
+++ systemd-9999.ebuild 30 Mar 2013 09:58:53 -0000 1.36 |
| 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.35 2013/03/30 09:37:50 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.36 2013/03/30 09:58:53 floppym Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -235,7 +235,7 @@ |
| 33 |
|
| 34 |
# Keep this here in case the database format changes so it gets updated |
| 35 |
# when required. Despite that this file is owned by sys-apps/hwids. |
| 36 |
- if use hwdb && has_version "sys-apps/hwids[udev]"; then |
| 37 |
+ if has_version "sys-apps/hwids[udev]"; then |
| 38 |
udevadm hwdb --update --root="${ROOT%/}" |
| 39 |
fi |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.2 sys-apps/systemd/systemd-200.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-200.ebuild?rev=1.2&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-200.ebuild?rev=1.2&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-200.ebuild?r1=1.1&r2=1.2 |
| 49 |
|
| 50 |
Index: systemd-200.ebuild |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-200.ebuild,v |
| 53 |
retrieving revision 1.1 |
| 54 |
retrieving revision 1.2 |
| 55 |
diff -u -r1.1 -r1.2 |
| 56 |
--- systemd-200.ebuild 29 Mar 2013 15:49:38 -0000 1.1 |
| 57 |
+++ systemd-200.ebuild 30 Mar 2013 09:58:53 -0000 1.2 |
| 58 |
@@ -1,6 +1,6 @@ |
| 59 |
# Copyright 1999-2013 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-200.ebuild,v 1.1 2013/03/29 15:49:38 mgorny Exp $ |
| 62 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-200.ebuild,v 1.2 2013/03/30 09:58:53 floppym Exp $ |
| 63 |
|
| 64 |
EAPI=5 |
| 65 |
|
| 66 |
@@ -42,7 +42,6 @@ |
| 67 |
# baselayout-2.2 has /run |
| 68 |
RDEPEND="${COMMON_DEPEND} |
| 69 |
>=sys-apps/baselayout-2.2 |
| 70 |
- >=sys-apps/hwids-20130309-r1[udev] |
| 71 |
|| ( |
| 72 |
>=sys-apps/util-linux-2.22 |
| 73 |
<sys-apps/sysvinit-2.88-r4 |
| 74 |
@@ -51,6 +50,8 @@ |
| 75 |
!<sys-libs/glibc-2.10 |
| 76 |
!sys-fs/udev" |
| 77 |
|
| 78 |
+PDEPEND=">=sys-apps/hwids-20130326.1[udev]" |
| 79 |
+ |
| 80 |
# sys-fs/quota is necessary to store correct paths in unit files |
| 81 |
DEPEND="${COMMON_DEPEND} |
| 82 |
app-arch/xz-utils |
| 83 |
@@ -202,6 +203,12 @@ |
| 84 |
fi |
| 85 |
systemd_update_catalog |
| 86 |
|
| 87 |
+ # Keep this here in case the database format changes so it gets updated |
| 88 |
+ # when required. Despite that this file is owned by sys-apps/hwids. |
| 89 |
+ if has_version "sys-apps/hwids[udev]"; then |
| 90 |
+ udevadm hwdb --update --root="${ROOT%/}" |
| 91 |
+ fi |
| 92 |
+ |
| 93 |
if [[ ! -L "${ROOT}"/etc/mtab ]]; then |
| 94 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
| 95 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.108 sys-apps/systemd/ChangeLog |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.108&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.108&content-type=text/plain |
| 103 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.107&r2=1.108 |
| 104 |
|
| 105 |
Index: ChangeLog |
| 106 |
=================================================================== |
| 107 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
| 108 |
retrieving revision 1.107 |
| 109 |
retrieving revision 1.108 |
| 110 |
diff -u -r1.107 -r1.108 |
| 111 |
--- ChangeLog 30 Mar 2013 09:37:50 -0000 1.107 |
| 112 |
+++ ChangeLog 30 Mar 2013 09:58:53 -0000 1.108 |
| 113 |
@@ -1,6 +1,10 @@ |
| 114 |
# ChangeLog for sys-apps/systemd |
| 115 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 116 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.107 2013/03/30 09:37:50 floppym Exp $ |
| 117 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.108 2013/03/30 09:58:53 floppym Exp $ |
| 118 |
+ |
| 119 |
+ 30 Mar 2013; Mike Gilbert <floppym@g.o> systemd-200.ebuild, |
| 120 |
+ systemd-9999.ebuild: |
| 121 |
+ Copy last two changes from live ebuild. |
| 122 |
|
| 123 |
30 Mar 2013; Mike Gilbert <floppym@g.o> systemd-9999.ebuild: |
| 124 |
Update hwids version per ssuominen. |
Archives