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

Collapse All | Expand All

(-)ivtv-0.2.0_rc3.ebuild.old (-2 / +5 lines)
Lines 36-42 Link Here
36
	cd ${WORKDIR}/${MY_P}/driver
36
	cd ${WORKDIR}/${MY_P}/driver
37
	sed -i -e 's:$(MODDIR):$(DESTDIR)/$(MODDIR):g' \
37
	sed -i -e 's:$(MODDIR):$(DESTDIR)/$(MODDIR):g' \
38
		-e 's:$(INCLUDEDIR):$(DESTDIR)/$(INCLUDEDIR):g' \
38
		-e 's:$(INCLUDEDIR):$(DESTDIR)/$(INCLUDEDIR):g' \
39
		-e "s:\$(shell uname -r):${KV_FULL}:g" \
39
		Makefile2.4 || die "sed failed"
40
		Makefile2.4 || die "sed failed"
41
	sed -i -e "s:\$(shell uname -r):${KV_FULL}:g" \
42
		Makefile2.6 Makefile || die "sed of 2.6 Makefile failed"
40
}
43
}
41
44
42
src_compile() {
45
src_compile() {
Lines 75-81 Link Here
75
	# for whatever reason, the Makefile doesn't make the dirs we need
78
	# for whatever reason, the Makefile doesn't make the dirs we need
76
	# fixes bug # 68110
79
	# fixes bug # 68110
77
	dodir /usr/include/linux
80
	dodir /usr/include/linux
78
	dodir /lib/modules/`uname -r`/extra
81
	dodir /lib/modules/${KV_FULL}/extra
79
	cd ${WORKDIR}/${MY_P}/driver
82
	cd ${WORKDIR}/${MY_P}/driver
80
	make DESTDIR=${D} INSTALL_MOD_PATH=${D} \
83
	make DESTDIR=${D} INSTALL_MOD_PATH=${D} \
81
		install || die "installation of driver failed"
84
		install || die "installation of driver failed"
Lines 114-120 Link Here
114
	echo
117
	echo
115
	einfo "The ptune* scripts have moved to media-tv/ivtv-ptune, emerge that to use those scripts"
118
	einfo "The ptune* scripts have moved to media-tv/ivtv-ptune, emerge that to use those scripts"
116
119
117
	if [ -f "/lib/modules/`uname -r`/kernel/drivers/media/video/msp3400.ko" ] ; then
120
	if [ -f "/lib/modules/${KV_FULL}/kernel/drivers/media/video/msp3400.ko" ] ; then
118
		ewarn "You have the msp3400 module that comes with the kernel. It isn't compatible"
121
		ewarn "You have the msp3400 module that comes with the kernel. It isn't compatible"
119
		ewarn "with ivtv. You need to back it up to somewhere else, then run depmod -ae again"
122
		ewarn "with ivtv. You need to back it up to somewhere else, then run depmod -ae again"
120
	fi
123
	fi

Return to bug 82016