1 |
floppym 15/08/01 15:10:12 |
2 |
|
3 |
Modified: systemd-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Remove code for defunct terminal USE flag. Re-enable networkd to support socket activation. |
6 |
|
7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.184 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.184&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.184&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.183&r2=1.184 |
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.183 |
20 |
retrieving revision 1.184 |
21 |
diff -u -r1.183 -r1.184 |
22 |
--- systemd-9999.ebuild 24 Jul 2015 20:14:18 -0000 1.183 |
23 |
+++ systemd-9999.ebuild 1 Aug 2015 15:10:12 -0000 1.184 |
24 |
@@ -1,12 +1,11 @@ |
25 |
# Copyright 1999-2015 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.183 2015/07/24 20:14:18 floppym Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.184 2015/08/01 15:10:12 floppym Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
AUTOTOOLS_AUTORECONF=yes |
33 |
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all |
34 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
35 |
|
36 |
if [[ ${PV} == 9999 ]]; then |
37 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
38 |
@@ -15,12 +14,9 @@ |
39 |
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
40 |
KEYWORDS="~amd64 ~arm ~ia64 ~x86" |
41 |
fi |
42 |
-UNIFONT=unifont-8.0.01 |
43 |
-SRC_URI+=" terminal? ( http://unifoundry.com/pub/${UNIFONT}/font-builds/${UNIFONT}.hex.gz )" |
44 |
|
45 |
inherit autotools-utils bash-completion-r1 linux-info multilib \ |
46 |
- multilib-minimal pam python-any-r1 systemd toolchain-funcs udev \ |
47 |
- user |
48 |
+ multilib-minimal pam systemd toolchain-funcs udev user |
49 |
|
50 |
DESCRIPTION="System and service manager for Linux" |
51 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
52 |
@@ -29,7 +25,7 @@ |
53 |
SLOT="0/2" |
54 |
IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http |
55 |
idn importd +kdbus +kmod +lz4 lzma nat pam policykit |
56 |
- qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb" |
57 |
+ qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" |
58 |
|
59 |
REQUIRED_USE="importd? ( curl gcrypt lzma )" |
60 |
|
61 |
@@ -65,9 +61,6 @@ |
62 |
sysv-utils? ( |
63 |
!sys-apps/systemd-sysv-utils |
64 |
!sys-apps/sysvinit ) |
65 |
- terminal? ( >=dev-libs/libevdev-1.2:0= |
66 |
- >=x11-libs/libxkbcommon-0.5:0= |
67 |
- >=x11-libs/libdrm-2.4:0= ) |
68 |
xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) |
69 |
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 |
70 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" |
71 |
@@ -98,7 +91,6 @@ |
72 |
ia64? ( >=sys-kernel/linux-headers-3.9 ) |
73 |
virtual/pkgconfig |
74 |
gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) |
75 |
- terminal? ( ${PYTHON_DEPS} ) |
76 |
test? ( >=sys-apps/dbus-1.6.8-r1:0 )" |
77 |
|
78 |
if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then |
79 |
@@ -172,10 +164,6 @@ |
80 |
# Fix systems broken by bug #509454. |
81 |
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev |
82 |
|
83 |
- if use terminal; then |
84 |
- python_setup |
85 |
- fi |
86 |
- |
87 |
multilib-minimal_src_configure |
88 |
} |
89 |
|
90 |
@@ -207,8 +195,6 @@ |
91 |
# no deps |
92 |
--enable-efi |
93 |
--enable-ima |
94 |
- # Moved to dev-python/python-systemd |
95 |
- --disable-python-devel |
96 |
--without-python |
97 |
|
98 |
# Optional components/dependencies |
99 |
@@ -236,8 +222,6 @@ |
100 |
$(multilib_native_use_enable qrcode qrencode) |
101 |
$(multilib_native_use_enable seccomp) |
102 |
$(multilib_native_use_enable selinux) |
103 |
- $(multilib_native_use_enable terminal) |
104 |
- $(multilib_native_use_with terminal unifont "${WORKDIR}/${UNIFONT}.hex") |
105 |
$(multilib_native_use_enable test tests) |
106 |
$(multilib_native_use_enable test dbus) |
107 |
$(multilib_native_use_enable xkb xkbcommon) |
108 |
@@ -424,6 +408,14 @@ |
109 |
fi |
110 |
} |
111 |
|
112 |
+reenable_unit() { |
113 |
+ if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then |
114 |
+ ebegin "Re-enabling $1" |
115 |
+ systemctl reenable --root="${ROOT}" "$1" |
116 |
+ eend $? || FAIL=1 |
117 |
+ fi |
118 |
+} |
119 |
+ |
120 |
pkg_postinst() { |
121 |
newusergroup() { |
122 |
enewgroup "$1" |
123 |
@@ -458,6 +450,9 @@ |
124 |
# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules |
125 |
migrate_net_name_slot |
126 |
|
127 |
+ # Re-enable systemd-networkd for socket activation |
128 |
+ reenable_unit systemd-networkd.service |
129 |
+ |
130 |
if [[ ${FAIL} ]]; then |
131 |
eerror "One of the postinst commands failed. Please check the postinst output" |
132 |
eerror "for errors. You may need to clean up your system and/or try installing" |
133 |
|
134 |
|
135 |
|
136 |
1.393 sys-apps/systemd/ChangeLog |
137 |
|
138 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.393&view=markup |
139 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.393&content-type=text/plain |
140 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.392&r2=1.393 |
141 |
|
142 |
Index: ChangeLog |
143 |
=================================================================== |
144 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
145 |
retrieving revision 1.392 |
146 |
retrieving revision 1.393 |
147 |
diff -u -r1.392 -r1.393 |
148 |
--- ChangeLog 24 Jul 2015 20:14:18 -0000 1.392 |
149 |
+++ ChangeLog 1 Aug 2015 15:10:12 -0000 1.393 |
150 |
@@ -1,6 +1,10 @@ |
151 |
# ChangeLog for sys-apps/systemd |
152 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
153 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.392 2015/07/24 20:14:18 floppym Exp $ |
154 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.393 2015/08/01 15:10:12 floppym Exp $ |
155 |
+ |
156 |
+ 01 Aug 2015; Mike Gilbert <floppym@g.o> systemd-9999.ebuild: |
157 |
+ Remove code for defunct terminal USE flag. Re-enable networkd to support |
158 |
+ socket activation. |
159 |
|
160 |
24 Jul 2015; Mike Gilbert <floppym@g.o> systemd-9999.ebuild: |
161 |
Remove /etc/systemd/systemd/sockets.target.wants, bug 555814. |