Attachment #252965 for bug #317539

View | Details | Raw Unified | Return to bug 317539 | Differences between
Collapse All | Expand All




IUSE=""

RDEPEND="=dev-libs/glib-2*
	sys-apps/pciutils
	sys-process/procps
	sys-apps/setserial
	sys-apps/grep


src_unpack() {
	unpack ${A}

	cd "${S}"

	epatch "${FILESDIR}"/irda-utils-rh1.patch \
		"${FILESDIR}"/${P}-makefile.diff \
		"${FILESDIR}"/${P}-smcinit.diff \
		"${FILESDIR}"/${P}-io.h.diff \
		"${FILESDIR}"/${P}-dofail.patch \
		"${FILESDIR}"/${P}-asneeded.patch \
		"${FILESDIR}"/${P}-ldflags.patch \
		"${FILESDIR}"/${P}-bitsperlong-317539.patch

	# fix crosscompile, respect CFLAGS (Bug 200295)
	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \
		-e "/^LD/s:ld:$(tc-getLD):" \
		-e "/^AR/s:ar:$(tc-getAR):" \
		-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
		-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile || die

	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)
	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile || die

	# disable etc subdir in Makefile
	sed -i -e "s:^\(DIRS.*=.* \)etc \(.*\):\1\2:g" Makefile || die

	# disable write_pid(), because we don't need it
	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c || die

	append-flags "-fno-strict-aliasing"
}

	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
		MANDIR="${D}usr/share/man"	|| die "emake install failed"

	newdoc ethereal/README README.wireshark || die
	newdoc irattach/README README.irattach || die
	newdoc irdadump/README README.irdadump || die
	newdoc irdaping/README README.irdaping || die
	newdoc irsockets/README README.irsockets || die
	newdoc tekram/README README.tekram || die
	newdoc smcinit/README README.smcinit || die
	newdoc smcinit/README.Peri README.smcinit.Peri || die
	newdoc smcinit/README.Rob README.smcinit.Rob || die
	newdoc smcinit/README.Tom README.smcinit.Tom || die
	newdoc irattach/ChangeLog ChangeLog.irattach || die
	newdoc irdadump/ChangeLog ChangeLog.irdadump || die
	newdoc smcinit/ChangeLog ChangeLog.smcinit || die
	dohtml smcinit/RobMiller-irda.html || die
	dodoc README || die

	newconfd "${FILESDIR}/irda.confd" irda || die
	newinitd "${FILESDIR}/irda.initd" irda || die

	insinto /etc/modprobe.d
	newins "${FILESDIR}/irda.modsd" irda.conf || die

	insinto /etc/udev/rules.d
	newins "${FILESDIR}/irda.rules" 53-irda.rules || die
	exeinto /lib/udev
	newexe "${FILESDIR}/irda-setup.sh" irda-setup || die
	newexe "${FILESDIR}/irda-usb.sh" irda-usb || die
}

Return to bug 317539

Lines 14-20 Link Here

(-)irda-utils-0.9.18-r4.ebuild.orig (-28 / +29 lines)
14	IUSE=""	14	IUSE=""
15		15
16	RDEPEND="=dev-libs/glib-2*	16	RDEPEND="=dev-libs/glib-2*
17	>=sys-apps/pciutils-2.2.7-r1	17	sys-apps/pciutils
18	sys-process/procps	18	sys-process/procps
19	sys-apps/setserial	19	sys-apps/setserial
20	sys-apps/grep	20	sys-apps/grep
Lines 25-55 Link Here
25		25
26	src_unpack() {	26	src_unpack() {
27	unpack ${A}	27	unpack ${A}
28
29	cd "${S}"	28	cd "${S}"
		29
30	epatch "${FILESDIR}"/irda-utils-rh1.patch \	30	epatch "${FILESDIR}"/irda-utils-rh1.patch \
31	"${FILESDIR}"/${P}-makefile.diff \	31	"${FILESDIR}"/${P}-makefile.diff \
32	"${FILESDIR}"/${P}-smcinit.diff \	32	"${FILESDIR}"/${P}-smcinit.diff \
33	"${FILESDIR}"/${P}-io.h.diff \	33	"${FILESDIR}"/${P}-io.h.diff \
34	"${FILESDIR}"/${P}-dofail.patch \	34	"${FILESDIR}"/${P}-dofail.patch \
35	"${FILESDIR}"/${P}-asneeded.patch \	35	"${FILESDIR}"/${P}-asneeded.patch \
36	"${FILESDIR}"/${P}-ldflags.patch	36	"${FILESDIR}"/${P}-ldflags.patch \
		37	"${FILESDIR}"/${P}-bitsperlong-317539.patch
37		38
38	# fix crosscompile, respect CFLAGS (Bug 200295)	39	# fix crosscompile, respect CFLAGS (Bug 200295)
39	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \	40	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \
40	-e "/^LD/s:ld:$(tc-getLD):" \	41	-e "/^LD/s:ld:$(tc-getLD):" \
41	-e "/^AR/s:ar:$(tc-getAR):" \	42	-e "/^AR/s:ar:$(tc-getAR):" \
42	-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \	43	-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
43	-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile	44	-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile \|\| die
44		45
45	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)	46	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)
46	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile	47	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile \|\| die
47		48
48	# disable etc subdir in Makefile	49	# disable etc subdir in Makefile
49	sed -i -e "s:^\(DIRS.=. \)etc \(.*\):\1\2:g" Makefile	50	sed -i -e "s:^\(DIRS.=. \)etc \(.*\):\1\2:g" Makefile \|\| die
50		51
51	# disable write_pid(), because we don't need it	52	# disable write_pid(), because we don't need it
52	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c	53	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c \|\| die
53		54
54	append-flags "-fno-strict-aliasing"	55	append-flags "-fno-strict-aliasing"
55	}	56	}
Lines 66-96 Link Here
66	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \	67	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
67	MANDIR="${D}usr/share/man" \|\| die "emake install failed"	68	MANDIR="${D}usr/share/man" \|\| die "emake install failed"
68		69
69	newdoc ethereal/README README.wireshark	70	newdoc ethereal/README README.wireshark \|\| die
70	newdoc irattach/README README.irattach	71	newdoc irattach/README README.irattach \|\| die
71	newdoc irdadump/README README.irdadump	72	newdoc irdadump/README README.irdadump \|\| die
72	newdoc irdaping/README README.irdaping	73	newdoc irdaping/README README.irdaping \|\| die
73	newdoc irsockets/README README.irsockets	74	newdoc irsockets/README README.irsockets \|\| die
74	newdoc tekram/README README.tekram	75	newdoc tekram/README README.tekram \|\| die
75	newdoc smcinit/README README.smcinit	76	newdoc smcinit/README README.smcinit \|\| die
76	newdoc smcinit/README.Peri README.smcinit.Peri	77	newdoc smcinit/README.Peri README.smcinit.Peri \|\| die
77	newdoc smcinit/README.Rob README.smcinit.Rob	78	newdoc smcinit/README.Rob README.smcinit.Rob \|\| die
78	newdoc smcinit/README.Tom README.smcinit.Tom	79	newdoc smcinit/README.Tom README.smcinit.Tom \|\| die
79	newdoc irattach/ChangeLog ChangeLog.irattach	80	newdoc irattach/ChangeLog ChangeLog.irattach \|\| die
80	newdoc irdadump/ChangeLog ChangeLog.irdadump	81	newdoc irdadump/ChangeLog ChangeLog.irdadump \|\| die
81	newdoc smcinit/ChangeLog ChangeLog.smcinit	82	newdoc smcinit/ChangeLog ChangeLog.smcinit \|\| die
82	dohtml smcinit/RobMiller-irda.html	83	dohtml smcinit/RobMiller-irda.html \|\| die
83	dodoc README	84	dodoc README \|\| die
84		85
85	newconfd "${FILESDIR}/irda.confd" irda	86	newconfd "${FILESDIR}/irda.confd" irda \|\| die
86	newinitd "${FILESDIR}/irda.initd" irda	87	newinitd "${FILESDIR}/irda.initd" irda \|\| die
87		88
88	insinto /etc/modprobe.d	89	insinto /etc/modprobe.d
89	newins "${FILESDIR}/irda.modsd" irda.conf	90	newins "${FILESDIR}/irda.modsd" irda.conf \|\| die
90		91
91	insinto /etc/udev/rules.d	92	insinto /etc/udev/rules.d
92	newins "${FILESDIR}/irda.rules" 53-irda.rules	93	newins "${FILESDIR}/irda.rules" 53-irda.rules \|\| die
93	exeinto /lib/udev	94	exeinto /lib/udev
94	newexe "${FILESDIR}/irda-setup.sh" irda-setup	95	newexe "${FILESDIR}/irda-setup.sh" irda-setup \|\| die
95	newexe "${FILESDIR}/irda-usb.sh" irda-usb	96	newexe "${FILESDIR}/irda-usb.sh" irda-usb \|\| die
96	}	97	}