commit: 068881d3d799c0dd14e60c67d29f00dac9c9521b Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jan 24 20:18:10 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jan 24 20:19:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068881d3
net-wireless/irda-utils: add -std=gnu89 to CFLAGS to restore pre-GCC5 semantics Gentoo-Bug: 570488 * Make all patches -p1 compatible for eventual switch to EAPI=6 Package-Manager: portage-2.2.27 .../files/irda-utils-0.9.18-asneeded.patch | 4 +- .../files/irda-utils-0.9.18-headers.patch | 4 +- .../files/irda-utils-0.9.18-smcinit.diff | 4 +- .../irda-utils/irda-utils-0.9.18-r5.ebuild | 105 +++++++++++++++++++++ 4 files changed, 111 insertions(+), 6 deletions(-) diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch index 26937a0..b678e6d 100644 --- a/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch +++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch @@ -2,8 +2,8 @@ Fixing as-needed issues http://bugs.gentoo.org/show_bug.cgi?id=318135 ---- irdadump/Makefile -+++ irdadump/Makefile +--- irda-utils-0.9.18/irdadump/Makefile ++++ irda-utils-0.9.18/irdadump/Makefile @@ -40,7 +40,7 @@ irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch index 1c40edc..a9814b3 100644 --- a/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch +++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch @@ -1,5 +1,5 @@ ---- tekram/Makefile.orig 2010-11-02 22:41:43.000000000 +0100 -+++ tekram/Makefile 2010-11-02 22:41:53.000000000 +0100 +--- irda-utils-0.9.18/tekram/Makefile.orig 2010-11-02 22:41:43.000000000 +0100 ++++ irda-utils-0.9.18/tekram/Makefile 2010-11-02 22:41:53.000000000 +0100 @@ -38,7 +38,7 @@ # # System stuff diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff b/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff index dd06efe..bd49362 100644 --- a/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff +++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff @@ -1,5 +1,5 @@ ---- smcinit/smcinit.c.orig 2006-07-11 08:16:06.000000000 +0200 -+++ smcinit/smcinit.c 2008-03-22 05:49:38.000000000 +0100 +--- irda-utils-0.9.18/smcinit/smcinit.c.orig 2006-07-11 08:16:06.000000000 +0200 ++++ irda-utils-0.9.18/smcinit/smcinit.c 2008-03-22 05:49:38.000000000 +0100 @@ -292,9 +292,9 @@ } diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r5.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r5.ebuild new file mode 100644 index 0000000..d04d69f --- /dev/null +++ b/net-wireless/irda-utils/irda-utils-0.9.18-r5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic toolchain-funcs udev + +DESCRIPTION="IrDA management and handling utilities" +HOMEPAGE="http://irda.sourceforge.net"; +SRC_URI="mirror://sourceforge/irda/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86" +IUSE="" + +RDEPEND=" + dev-libs/glib:2 + >=sys-apps/pciutils-2.2.7-r1 + sys-process/procps + sys-apps/setserial + sys-apps/grep + virtual/udev +" +DEPEND="${RDEPEND} + virtual/pkgconfig + !app-laptop/smcinit +" + +PATCHES=( + "${FILESDIR}/${PN}-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}-headers.patch" +) + +src_prepare() { + # TODO: switch to 'default' once udev.eclass is EAPI=6 clean + epatch -p1 "${PATCHES[@]}" + + append-flags "-fno-strict-aliasing" # bug???? + + # fix Bug 570488 by restoring pre-GCC5 inline semantics + append-cflags -std=gnu89 + + # 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 +} + +src_compile() { + emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}" +} + +src_install () { + dodir /usr/bin + dodir /usr/sbin + + emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \ + MANDIR="${D}usr/share/man" + + newdoc ethereal/README README.wireshark + newdoc irattach/README README.irattach + newdoc irdadump/README README.irdadump + newdoc irdaping/README README.irdaping + newdoc irsockets/README README.irsockets + newdoc tekram/README README.tekram + newdoc smcinit/README README.smcinit + newdoc smcinit/README.Peri README.smcinit.Peri + newdoc smcinit/README.Rob README.smcinit.Rob + newdoc smcinit/README.Tom README.smcinit.Tom + newdoc irattach/ChangeLog ChangeLog.irattach + newdoc irdadump/ChangeLog ChangeLog.irdadump + newdoc smcinit/ChangeLog ChangeLog.smcinit + dohtml smcinit/RobMiller-irda.html + dodoc README + + newconfd "${FILESDIR}/irda.confd" irda + newinitd "${FILESDIR}/irda.initd" irda + + insinto /etc/modprobe.d + newins "${FILESDIR}/irda.modsd" irda.conf + + udev_newrules "${FILESDIR}/irda.rules" 53-irda.rules + exeinto "$(get_udevdir)" + newexe "${FILESDIR}/irda-setup.sh" irda-setup + newexe "${FILESDIR}/irda-usb.sh" irda-usb +}
