mgorny 14/05/03 15:58:48
Modified: systemd-208.9999.ebuild systemd-208-r2.ebuild
systemd-212-r3.ebuild systemd-9999.ebuild
systemd-208.277.ebuild systemd-208-r3.ebuild
ChangeLog
Log:
Fix not respecting MY_UDEVDIR, bug #509454.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.4 sys-apps/systemd/systemd-208.9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208.9999.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208.9999.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208.9999.ebuild?r1=1.3&r2=1.4
Index: systemd-208.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- systemd-208.9999.ebuild 4 Mar 2014 23:13:20 -0000 1.3
+++ systemd-208.9999.ebuild 3 May 2014 15:58:48 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.9999.ebuild,v
1.3 2014/03/04 23:13:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.9999.ebuild,v
1.4 2014/05/03 15:58:48 mgorny Exp $
EAPI=5
@@ -162,6 +162,15 @@
use python && python-single-r1_pkg_setup
}
+src_configure() {
+ # Keep using the one where the rules were installed.
+ MY_UDEVDIR=$(get_udevdir)
+ # Fix systems broken by bug #509454.
+ [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib
+
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
local myeconfargs=(
--localstatedir=/var
@@ -205,9 +214,6 @@
QUOTACHECK=/usr/sbin/quotacheck
)
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
-
if use firmware-loader; then
myeconfargs+=(
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
1.21 sys-apps/systemd/systemd-208-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild?r1=1.20&r2=1.21
Index: systemd-208-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- systemd-208-r2.ebuild 1 Mar 2014 22:37:05 -0000 1.20
+++ systemd-208-r2.ebuild 3 May 2014 15:58:48 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v
1.20 2014/03/01 22:37:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v
1.21 2014/05/03 15:58:48 mgorny Exp $
EAPI=5
@@ -137,6 +137,15 @@
autotools-utils_src_prepare
}
+src_configure() {
+ # Keep using the one where the rules were installed.
+ MY_UDEVDIR=$(get_udevdir)
+ # Fix systems broken by bug #509454.
+ [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib
+
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
local myeconfargs=(
--localstatedir=/var
@@ -180,9 +189,6 @@
QUOTACHECK=/usr/sbin/quotacheck
)
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
-
if use firmware-loader; then
myeconfargs+=(
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
1.2 sys-apps/systemd/systemd-212-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-212-r3.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-212-r3.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-212-r3.ebuild?r1=1.1&r2=1.2
Index: systemd-212-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemd-212-r3.ebuild 2 May 2014 09:10:16 -0000 1.1
+++ systemd-212-r3.ebuild 3 May 2014 15:58:48 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r3.ebuild,v
1.1 2014/05/02 09:10:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r3.ebuild,v
1.2 2014/05/03 15:58:48 mgorny Exp $
EAPI=5
@@ -142,6 +142,15 @@
use python && python-single-r1_pkg_setup
}
+src_configure() {
+ # Keep using the one where the rules were installed.
+ MY_UDEVDIR=$(get_udevdir)
+ # Fix systems broken by bug #509454.
+ [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib
+
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
local myeconfargs=(
# disable -flto since it is an optimization flag
@@ -198,9 +207,6 @@
--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
)
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
-
if use firmware-loader; then
myeconfargs+=(
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
1.107 sys-apps/systemd/systemd-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.107&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.107&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.106&r2=1.107
Index: systemd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- systemd-9999.ebuild 2 May 2014 09:23:38 -0000 1.106
+++ systemd-9999.ebuild 3 May 2014 15:58:48 -0000 1.107
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.106 2014/05/02 09:23:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
1.107 2014/05/03 15:58:48 mgorny Exp $
EAPI=5
@@ -164,6 +164,15 @@
use python && python-single-r1_pkg_setup
}
+src_configure() {
+ # Keep using the one where the rules were installed.
+ MY_UDEVDIR=$(get_udevdir)
+ # Fix systems broken by bug #509454.
+ [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib
+
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
local myeconfargs=(
# disable -flto since it is an optimization flag
@@ -220,9 +229,6 @@
--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
)
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
-
if use firmware-loader; then
myeconfargs+=(
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
1.2 sys-apps/systemd/systemd-208.277.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208.277.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208.277.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208.277.ebuild?r1=1.1&r2=1.2
Index: systemd-208.277.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.277.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemd-208.277.ebuild 4 Mar 2014 23:13:20 -0000 1.1
+++ systemd-208.277.ebuild 3 May 2014 15:58:48 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.277.ebuild,v
1.1 2014/03/04 23:13:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208.277.ebuild,v
1.2 2014/05/03 15:58:48 mgorny Exp $
EAPI=5
@@ -132,6 +132,15 @@
use python && python-single-r1_pkg_setup
}
+src_configure() {
+ # Keep using the one where the rules were installed.
+ MY_UDEVDIR=$(get_udevdir)
+ # Fix systems broken by bug #509454.
+ [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib
+
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
local myeconfargs=(
--localstatedir=/var
@@ -175,9 +184,6 @@
QUOTACHECK=/usr/sbin/quotacheck
)
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
-
if use firmware-loader; then
myeconfargs+=(
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
1.4 sys-apps/systemd/systemd-208-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild?r1=1.3&r2=1.4
Index: systemd-208-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- systemd-208-r3.ebuild 1 Mar 2014 22:37:05 -0000 1.3
+++ systemd-208-r3.ebuild 3 May 2014 15:58:48 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild,v
1.3 2014/03/01 22:37:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild,v
1.4 2014/05/03 15:58:48 mgorny Exp $
EAPI=5
@@ -137,6 +137,15 @@
autotools-utils_src_prepare
}
+src_configure() {
+ # Keep using the one where the rules were installed.
+ MY_UDEVDIR=$(get_udevdir)
+ # Fix systems broken by bug #509454.
+ [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib
+
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
local myeconfargs=(
--localstatedir=/var
@@ -180,9 +189,6 @@
QUOTACHECK=/usr/sbin/quotacheck
)
- # Keep using the one where the rules were installed.
- MY_UDEVDIR=$(get_udevdir)
-
if use firmware-loader; then
myeconfargs+=(
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
1.252 sys-apps/systemd/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.252&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.252&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.251&r2=1.252
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- ChangeLog 2 May 2014 09:23:38 -0000 1.251
+++ ChangeLog 3 May 2014 15:58:48 -0000 1.252
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.251
2014/05/02 09:23:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.252
2014/05/03 15:58:48 mgorny Exp $
+
+ 03 May 2014; Michał Górny <mgo...@gentoo.org> systemd-208-r2.ebuild,
+ systemd-208-r3.ebuild, systemd-208.277.ebuild, systemd-208.9999.ebuild,
+ systemd-212-r3.ebuild, systemd-9999.ebuild:
+ Fix not respecting MY_UDEVDIR, bug #509454.
02 May 2014; Michał Górny <mgo...@gentoo.org> systemd-9999.ebuild:
Fix the same typo in the live ebuild as well.
