1 |
commit: 5fc20334526d9adead8177fe34d2920551700163 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 26 16:47:38 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 26 16:50:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc20334 |
7 |
|
8 |
sys-fs/udev: bump to 241-rc1 |
9 |
|
10 |
Package-Manager: Portage-2.3.56_p3, Repoman-2.3.12_p50 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
sys-fs/udev/Manifest | 1 + |
14 |
sys-fs/udev/{udev-9999.ebuild => udev-241_rc1.ebuild} | 14 +++++++++----- |
15 |
sys-fs/udev/udev-9999.ebuild | 14 +++++++++----- |
16 |
3 files changed, 19 insertions(+), 10 deletions(-) |
17 |
|
18 |
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest |
19 |
index 5cfd2e7b180..2c0843aff6d 100644 |
20 |
--- a/sys-fs/udev/Manifest |
21 |
+++ b/sys-fs/udev/Manifest |
22 |
@@ -4,3 +4,4 @@ DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c01 |
23 |
DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313 |
24 |
DIST systemd-240-patches-3.tar.gz 31952 BLAKE2B 0677d24c4f4e1575dbd4953eb75734f0773671e4ffc2a8d848353a379f5ea2caf4f96620ed6303d98ec00a15367d5e2124b493aaef80b1a0fe118866a1c04ada SHA512 e604e1de17bcd4c941036f12d2e3ae96dd6e86647db2b07576e8468405900b6e8af6a0e55a50c7e9b19704601930b8152c8ac506b2624e261ee0cd35dfc91a21 |
25 |
DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5 |
26 |
+DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0 |
27 |
|
28 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-241_rc1.ebuild |
29 |
similarity index 97% |
30 |
copy from sys-fs/udev/udev-9999.ebuild |
31 |
copy to sys-fs/udev/udev-241_rc1.ebuild |
32 |
index 7934423439b..15a9c359d90 100644 |
33 |
--- a/sys-fs/udev/udev-9999.ebuild |
34 |
+++ b/sys-fs/udev/udev-241_rc1.ebuild |
35 |
@@ -1,4 +1,4 @@ |
36 |
-# Copyright 1999-2018 Gentoo Authors |
37 |
+# Copyright 1999-2019 Gentoo Authors |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
EAPI=6 |
41 |
@@ -9,7 +9,10 @@ if [[ ${PV} = 9999* ]]; then |
42 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
43 |
inherit git-r3 |
44 |
else |
45 |
- SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" |
46 |
+ MY_PV=${PV/_/-} |
47 |
+ MY_P=systemd-${MY_PV} |
48 |
+ S=${WORKDIR}/${MY_P} |
49 |
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${MY_P}.tar.gz" |
50 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
51 |
fi |
52 |
|
53 |
@@ -49,9 +52,6 @@ RDEPEND="${COMMON_DEPEND} |
54 |
PDEPEND=">=sys-apps/hwids-20140304[udev] |
55 |
>=sys-fs/udev-init-scripts-26" |
56 |
|
57 |
-S=${WORKDIR}/systemd-${PV} |
58 |
-EGIT_CHECKOUT_DIR=${S} |
59 |
- |
60 |
pkg_setup() { |
61 |
if [[ ${MERGE_TYPE} != buildonly ]]; then |
62 |
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" |
63 |
@@ -80,6 +80,10 @@ src_prepare() { |
64 |
ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" |
65 |
EOF |
66 |
|
67 |
+ if [[ -d "${WORKDIR}/patches" ]]; then |
68 |
+ eapply "${WORKDIR}/patches" |
69 |
+ fi |
70 |
+ |
71 |
local PATCHES=( |
72 |
"${FILESDIR}/236-uucp-group.patch" |
73 |
) |
74 |
|
75 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
76 |
index 7934423439b..15a9c359d90 100644 |
77 |
--- a/sys-fs/udev/udev-9999.ebuild |
78 |
+++ b/sys-fs/udev/udev-9999.ebuild |
79 |
@@ -1,4 +1,4 @@ |
80 |
-# Copyright 1999-2018 Gentoo Authors |
81 |
+# Copyright 1999-2019 Gentoo Authors |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
|
84 |
EAPI=6 |
85 |
@@ -9,7 +9,10 @@ if [[ ${PV} = 9999* ]]; then |
86 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
87 |
inherit git-r3 |
88 |
else |
89 |
- SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" |
90 |
+ MY_PV=${PV/_/-} |
91 |
+ MY_P=systemd-${MY_PV} |
92 |
+ S=${WORKDIR}/${MY_P} |
93 |
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${MY_P}.tar.gz" |
94 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
95 |
fi |
96 |
|
97 |
@@ -49,9 +52,6 @@ RDEPEND="${COMMON_DEPEND} |
98 |
PDEPEND=">=sys-apps/hwids-20140304[udev] |
99 |
>=sys-fs/udev-init-scripts-26" |
100 |
|
101 |
-S=${WORKDIR}/systemd-${PV} |
102 |
-EGIT_CHECKOUT_DIR=${S} |
103 |
- |
104 |
pkg_setup() { |
105 |
if [[ ${MERGE_TYPE} != buildonly ]]; then |
106 |
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" |
107 |
@@ -80,6 +80,10 @@ src_prepare() { |
108 |
ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" |
109 |
EOF |
110 |
|
111 |
+ if [[ -d "${WORKDIR}/patches" ]]; then |
112 |
+ eapply "${WORKDIR}/patches" |
113 |
+ fi |
114 |
+ |
115 |
local PATCHES=( |
116 |
"${FILESDIR}/236-uucp-group.patch" |
117 |
) |