Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 410147 | Differences between
and this patch

Collapse All | Expand All

(-)udev-182-r3.ebuild (-21 / +24 lines)
Lines 29-43 Link Here
29
29
30
LICENSE="GPL-2"
30
LICENSE="GPL-2"
31
SLOT="0"
31
SLOT="0"
32
IUSE="build selinux debug +rule_generator hwdb gudev introspection
32
IUSE="build selinux debug +rule_generator hwdb gudev introspection 
33
	keymap floppy doc static-libs +openrc"
33
	keymap floppy doc static-libs +openrc usr"
34
34
35
COMMON_DEPEND="selinux? ( sys-libs/libselinux )
35
COMMON_DEPEND="selinux? ( sys-libs/libselinux )
36
	gudev? ( dev-libs/glib:2 )
36
	gudev? ( dev-libs/glib:2 )
37
	introspection? ( dev-libs/gobject-introspection )
37
	introspection? ( dev-libs/gobject-introspection )
38
	>=sys-apps/kmod-5
38
	>=sys-apps/kmod-5
39
	>=sys-apps/util-linux-2.20
39
	>=sys-apps/util-linux-2.20
40
	!<sys-libs/glibc-2.10"
40
	!<sys-libs/glibc-2.10
41
	usr? ( sys-apps/kmod[usr] )"
41
42
42
DEPEND="${COMMON_DEPEND}
43
DEPEND="${COMMON_DEPEND}
43
	keymap? ( dev-util/gperf )
44
	keymap? ( dev-util/gperf )
Lines 65-69 Link Here
65
	!<sys-fs/lvm2-2.02.45
65
	!<sys-fs/lvm2-2.02.45
66
	!sys-fs/device-mapper
66
	!sys-fs/device-mapper
67
	!<sys-fs/udev-init-scripts-10
68
	!<sys-kernel/dracut-017-r1
67
	!<sys-kernel/dracut-017-r1
69
	!<sys-kernel/genkernel-3.4.25"
68
	!<sys-kernel/genkernel-3.4.25"
Lines 138-152 Link Here
138
		fi
138
		fi
139
		elibtoolize
139
		elibtoolize
140
	fi
140
	fi
141
	if use usr ; then
142
		epatch "${FILESDIR}"/udev-182-separate_usr.patch
143
	fi
141
}
144
}
142
145
143
src_configure()
146
src_configure()
144
{
147
{
148
	local myconf
149
	myconf="--libdir=/usr/$(get_libdir)"
150
151
	if use usr ; then
152
		myconf="--bindir=/bin --libdir=/lib"
153
	fi
154
145
	filter-flags -fprefetch-loop-arrays
155
	filter-flags -fprefetch-loop-arrays
146
	econf \
156
	econf \
147
		--with-rootprefix=/ \
157
		--with-rootprefix=/ \
148
		--libdir=/usr/$(get_libdir) \
149
		--libexecdir=/lib \
158
		--libexecdir=/lib \
159
		$myconf \
160
		$(use_enable introspection) \
150
		$(use_enable static-libs static) \
161
		$(use_enable static-libs static) \
151
		$(use_with selinux) \
162
		$(use_with selinux) \
152
		$(use_enable debug) \
163
		$(use_enable debug) \
Lines 157-163 Link Here
157
		--with-pci-ids-path=/usr/share/misc/pci.ids \
168
		--with-pci-ids-path=/usr/share/misc/pci.ids \
158
		--with-usb-ids-path=/usr/share/misc/usb.ids \
169
		--with-usb-ids-path=/usr/share/misc/usb.ids \
159
		$(use_enable gudev) \
170
		$(use_enable gudev) \
160
		$(use_enable introspection) \
161
		$(use_enable keymap) \
171
		$(use_enable keymap) \
162
		$(use_enable floppy) \
172
		$(use_enable floppy) \
163
		$(use_enable doc gtk-doc) \
173
		$(use_enable doc gtk-doc) \
Lines 175-206 Link Here
175
	dodoc ChangeLog NEWS README TODO
185
	dodoc ChangeLog NEWS README TODO
176
	use keymap && dodoc src/keymap/README.keymap.txt
186
	use keymap && dodoc src/keymap/README.keymap.txt
177
187
188
	local htmldir
189
	for htmldir in gudev libudev; do
190
		[[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]] &&
191
			dosym /usr/share/doc/${PF}/html/${htmldir} \
192
				/usr/share/gtk-doc/html/${htmldir}
193
	done
194
178
	# udevadm is now in /usr/bin.
195
	# udevadm is now in /usr/bin.
179
	dosym /usr/bin/udevadm /sbin/udevadm
196
	dosym /usr/bin/udevadm /sbin/udevadm
180
197
181
	# create symlinks for these utilities to /sbin
198
	# create symlinks for these utilities to /sbin
182
	# where multipath-tools expect them to be (Bug #168588)
199
	# where multipath-tools expect them to be (Bug #168588)
183
	dosym /lib/udev/scsi_id /sbin/scsi_id
200
	dosym /lib/udevd/scsi_id /sbin/scsi_id
184
201
185
	# Now install rules
202
	# Now install rules
186
	insinto /lib/udev/rules.d
203
	insinto /lib/udev/rules.d
187
	doins "${FILESDIR}"/40-gentoo.rules
204
	doins "${FILESDIR}"/40-gentoo.rules
188
}
205
}
189
206
190
pkg_preinst()
191
{
192
	local htmldir
193
	for htmldir in gudev libudev; do
194
		if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
195
			rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir}
196
		fi
197
		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
198
			dosym /usr/share/doc/${PF}/html/${htmldir} \
199
				/usr/share/gtk-doc/html/${htmldir}
200
		fi
201
	done
202
}
203
204
# 19 Nov 2008
207
# 19 Nov 2008
205
fix_old_persistent_net_rules()
208
fix_old_persistent_net_rules()
206
{
209
{

Return to bug 410147