[patch] fix-imake-ebuild.patch

fix-imake-gcc48.patch (text/plain), 4.97 KB, created by Greg Turner on 2014-01-24 21:22:25 UTC

diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index b9957fe..7ea75cb 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,4 +1,5 @@
+AUX imake-1.0.6-gcc48-avoid-stdin.patch 1264 SHA256 365a8d6c18941f7dd5bacc18f8bce535da1de491e492d02341c5002ac19b5227 SHA512 1e453d3b58c14b07c3bf41b179cea450e0a34bf7f5f3e03ca6242a1b0d15fb906c6bf1a218925b425030745d352e9e9831ca5bc50afd16fc518ea7020cca773b WHIRLPOOL b2ba06f9ed59934e08b6f97184da16749449fa5ee3b80655727439392be02cae98e26cfab8496c5ae3b32441f4ecbffc0bab49caf06e2021332e76ade783d0b0
 DIST imake-1.0.6.tar.bz2 155571 SHA256 fa8983fdb0a72ba8482d1d2683967fb45c29edd7149b25f619f97ea5a599069d SHA512 5e0744903c8b044fac98859fee1d15fe1db4b8346a1b1fd0c8c8a683914c3a83a2d18316cadf1ab7ee455004b761c1fa7808bdf48bbfb9e7cbe6c7c143ad2f43 WHIRLPOOL 091e0f6e8708fccdede729f412b4ae777dbc329372d3dd99ea04181a1ddb41cd0e750ca1252cb72fba8377ffb535096e173d6bde97823060355f2d9765eda31f
-EBUILD imake-1.0.6-r1.ebuild 723 SHA256 4d852c467cc10daaf855336726f590ef2c1d5bf5d21e377816ded9f9c222abdb SHA512 36c792ebf0b1cdeb57cc95c1c5f8443c25df9e85ca42d6b19b14af9ca8ad3376fc8e0cf837d6fbbfe9ff4b52ce707a49e1eb251f4df9551c7bc8d2e4ab645517 WHIRLPOOL f280eade48625daf4707e23148c8f98147bd8251d85735c3335e3387d3a91b6567410a8d5db8137df02f126c6eec50d56a5e4550869b653dcc08cbb876c3934e
+EBUILD imake-1.0.6-r1.ebuild 685 SHA256 8cfc7da45f0f25841186e3c8343b4a1ddbabd0cf83149f88ec224092c64c8d43 SHA512 8ded9415995c1dab2b51b76566a14348b6f60a882caddeb21f0de83e12daae595cedcbf2a4c9b95e075a05c9b5805c1036d18b1e6939f88e60e4ebd197b50c75 WHIRLPOOL 4fae4ec926566dee693803f5c922b4e865be6914659b9a1c612a8e52b972b549ca4bd93143c99470449e8ab6b273231c82cb7e4919cf232216aef0ed6c392371
 MISC ChangeLog 7959 SHA256 711172ea1440d54bb815887d7a02f8b7a04bd2818939826fea4583a0f1812e7c SHA512 68aabc00d1e148b1b28f9f1e5599a970290981c1b5dad38ce8f5e81efa7494d5b9d7542f931166af87f6be53321221ef9bd55961d869d6b7ab8a590c06c1da88 WHIRLPOOL 4c35e9d9545cf8c3aa2986097ed9317b8c604f5340ff56be4c87d62102bfe7899b47b508acd341594de1f585ebee00b028938370fe16f89cb69c995a9a21005d
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-misc/imake/files/imake-1.0.6-gcc48-avoid-stdin.patch b/x11-misc/imake/files/imake-1.0.6-gcc48-avoid-stdin.patch
new file mode 100644
index 0000000..0f0be9b
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.6-gcc48-avoid-stdin.patch
@@ -0,0 +1,22 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=74031
+
+diff -urpN imake-1.0.6.orig/Makefile.am imake-1.0.6/Makefile.am
+--- imake-1.0.6.orig/Makefile.am	2013-07-22 21:53:04.000000000 -0700
++++ imake-1.0.6/Makefile.am	2014-01-24 11:46:07.825378603 -0800
+@@ -76,13 +76,13 @@ bin_SCRIPTS = \
+ 	$(MKHTMLINDEX)
+ 
+ xmkmf: xmkmf.cpp
+-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
++	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
+ 
+ ccmakedep: mdepend.cpp
+-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
++	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
+ 
+ mergelib: mergelib.cpp
+-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
++	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
+ 
+ if HAS_PERL
+ MKHTMLINDEX_SCRIPT = $(srcdir)/mkhtmlindex.pl
diff --git a/x11-misc/imake/imake-1.0.6-r1.ebuild b/x11-misc/imake/imake-1.0.6-r1.ebuild
index eb27a23..5200d8c 100644
--- a/x11-misc/imake/imake-1.0.6-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.6-r1.ebuild
@@ -5,20 +5,25 @@
 EAPI=4
 
 XORG_STATIC=no
-inherit xorg-2
+XORG_EAUTORECONF=yes
+inherit eutils xorg-2
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+# backport upstream fix: https://bugs.freedesktop.org/show_bug.cgi?id=69439
+PATCHES=( "${FILESDIR}"/${P}-gcc48-avoid-stdin.patch )
+
 src_prepare() {
 	# don't use Sun compilers on Solaris, we want GCC from prefix
 	sed -i \
 		-e "1s/^/#if defined(sun)\n# undef sun\n#endif/" \
 		imake.c imakemdep.h || die "sed failed"
+
 	xorg-2_src_prepare
 }