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

Collapse All | Expand All

(-)speedtouch-usb-3.0.1.2.ebuild-old (-37 / +35 lines)
Lines 12-27 Link Here
12
LICENSE="SpeedTouch-USB-Firmware"
12
LICENSE="SpeedTouch-USB-Firmware"
13
SLOT="0"
13
SLOT="0"
14
KEYWORDS="~x86"
14
KEYWORDS="~x86"
15
IUSE=""
15
IUSE="atm"
16
17
# udev replaces hotplug, as mentioned at 
18
# http://www.linux-usb.org/SpeedTouch/firmware/firmware.html
19
# hotplug only needs to be *installed*, to create /etc/hotplug/usb/ - it does
20
# not need to be running.
21
16
22
RDEPEND=">=net-dialup/ppp-2.4.3-r11
17
RDEPEND=">=net-dialup/ppp-2.4.3-r11
23
	>=sys-apps/hotplug-20040923-r1
18
	>=sys-fs/udev-086
24
	>=sys-fs/udev-079-r1
25
	!net-dialup/speedtouch"
19
	!net-dialup/speedtouch"
26
DEPEND="${RDEPEND}
20
DEPEND="${RDEPEND}
27
	app-arch/unzip"
21
	app-arch/unzip"
Lines 38-45 Link Here
38
	fi
32
	fi
39
33
40
	if ! has_version '>=sys-apps/baselayout-1.12.0_pre16' ; then
34
	if ! has_version '>=sys-apps/baselayout-1.12.0_pre16' ; then
41
		ewarn "The best way of using speedtouch driver is through pppd net module of the"
35
		ewarn "The best way of using this driver is through the pppd net module of"
42
		ewarn ">=sys-apps/baselayout-1.12.0_pre16 package, which is also the only"
36
		ewarn ">=sys-apps/baselayout-1.12.0_pre16, which is also the only"
43
		ewarn "documented mode of using ${CATEGORY}/${PN}."
37
		ewarn "documented mode of using ${CATEGORY}/${PN}."
44
		ewarn "Please install baselayout-1.12.0_pre16 or else you will be on your own!"
38
		ewarn "Please install baselayout-1.12.0_pre16 or else you will be on your own!"
45
		ebeep
39
		ebeep
Lines 83-124 Link Here
83
		ln -sfn speedtch-${stub}${n}.bin.4 speedtch-${n}.bin.3
77
		ln -sfn speedtch-${stub}${n}.bin.4 speedtch-${n}.bin.3
84
	done
78
	done
85
79
86
	insinto /etc/hotplug/usb
80
	# Documentation necessary to complete the setup
87
	insopts -m 644
88
	doins "${FILESDIR}/speedtch.usermap" || die "doins usermap failed"
89
90
	# The documentation necessary to complete the setup
91
	dodoc "${FILESDIR}/README" || die "dodoc failed"
81
	dodoc "${FILESDIR}/README" || die "dodoc failed"
92
}
82
}
93
83
94
pkg_postinst() {
84
pkg_postinst() {
95
	[[ -e /etc/hotplug/usb.usermap ]] && egrep -q " 0x06[bB]9 +0x4061 " /etc/hotplug/usb.usermap && \
85
	local kernel_modules
86
87
	[[ -e /etc/hotplug/usb.usermap ]] && egrep -q " 0x06[bB]9 +0x4061 " \
88
		/etc/hotplug/usb.usermap && \
96
		ewarn "Please remove the SpeedTouch line from /etc/hotplug/usb.usermap"
89
		ewarn "Please remove the SpeedTouch line from /etc/hotplug/usb.usermap"
97
90
98
	#Check kernel configuration
91
	# Check kernel configuration
92
	if use atm ; then
93
		kernel_modules="~PPPOATM"
94
	else
95
		kernel_modules="~PPPOE ~ATM_BR2684"
96
	fi
99
	CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES \
97
	CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES \
100
		~PPP ~PPPOATM ~ATM_BR2684 ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH"
98
		~PPP ${kernel_modules} ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH"
101
	check_extra_config
99
	check_extra_config
102
	einfo "Note: All the above kernel configurations are required except the following:"
100
103
	einfo "   - CONFIG_ATM_BR2684 is needed only for PPPoE links, while"
101
	if use atm ; then
104
	einfo "   - CONFIG_PPPOATM is needed only for PPPoA links."
102
		# Check for PPPoA support
105
	echo
103
		if ! built_with_use net-dialup/ppp atm ; then
106
104
			eerror "PPPoA support: net-dialup/ppp should be built with 'atm' USE flag enabled!"
107
	# Check user space for PPPoA support
105
			eerror "Run the following command if you need PPPoA support:"
108
	if ! built_with_use net-dialup/ppp atm ; then
106
			eerror "  euse -E atm && emerge net-dialup/ppp"
109
		eerror "PPPoA support: net-dialup/ppp should be built with 'atm' USE flag enabled!"
107
			echo
110
		ewarn "Run the following command if you need PPPoA support:"
108
		fi
111
		einfo "  euse -E atm && emerge net-dialup/ppp"
109
	else
112
		echo
110
		# Check for PPPoE support
113
	fi
111
		einfo "Defaulting to PPPoE - the 'atm' USE flag is not enabled"
114
	# Check user space PPPoE support
112
		if ! has_version net-misc/br2684ctl ; then
115
	if ! has_version net-misc/br2684ctl ; then
113
			eerror "PPPoE support: net-misc/br2684ctl is not installed!"
116
		eerror "PPPoE support: net-misc/br2684ctl is not installed!"
114
			eerror "Run the following command if you need PPPoE support:"
117
		ewarn "Run the following command if you need PPPoE support:"
115
			eerror "  emerge net-misc/br2684ctl"
118
		einfo "   emerge net-misc/br2684ctl"
116
			echo
119
		echo
117
		fi
120
	fi
118
	fi
121
119
122
	ewarn "To complete the installation, you must read the documentation available in"
120
	ewarn "To complete the installation, you must read the documentation available in"
123
	ewarn "   ${ROOT}usr/share/doc/${PF}"
121
	ewarn "  ${ROOT}usr/share/doc/${PF}"
124
}
122
}

Return to bug 110665