Cleanup ugly build code #146903 by throw_away_2002.

Package-Manager: portage-2.1.1_rc1-r6

4 files changed, 76 insertions, 14 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 0eef102e7a87..7c786b48c470 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.89 2006/08/01 04:48:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.90 2006/09/09 10:28:27 vapier Exp $
+
+  09 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.39-parse-types.patch, e2fsprogs-1.39.ebuild:
+  Cleanup ugly build code #146903 by throw_away_2002.
 
 *e2fsprogs-1.39 (01 Aug 2006)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index fc4b17b6baa8..5f14696965af 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -41,20 +41,24 @@ AUX e2fsprogs-1.39-makefile.patch 2646 RMD160 5e5dca19f977c56d516ab1df3bf65700d8
 MD5 563afe8d7066693b54647bc3c82eaee0 files/e2fsprogs-1.39-makefile.patch 2646
 RMD160 5e5dca19f977c56d516ab1df3bf65700d870425a files/e2fsprogs-1.39-makefile.patch 2646
 SHA256 b9d6876b76f36e873295e1ad7301d86dc00d7f2adab0743de57be9adf1578f9a files/e2fsprogs-1.39-makefile.patch 2646
+AUX e2fsprogs-1.39-parse-types.patch 1117 RMD160 5858224739c494ae2e31507b217594cd1bf0440f SHA1 fa6ff6f281dca7d14e946df39c9b30a9faa14565 SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd
+MD5 29853daadd9ea0d27abcc57e46d48e25 files/e2fsprogs-1.39-parse-types.patch 1117
+RMD160 5858224739c494ae2e31507b217594cd1bf0440f files/e2fsprogs-1.39-parse-types.patch 1117
+SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd files/e2fsprogs-1.39-parse-types.patch 1117
 DIST e2fsprogs-1.38.tar.gz 3621193 RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c SHA1 aa8915fe43bc7cf5fba633df7041009ce9981551 SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
 EBUILD e2fsprogs-1.38-r1.ebuild 4471 RMD160 41bb370af6a8e35e58554823c7753e9b8687cbcc SHA1 d43b950c659f43f80df8bcfd5b9fd5785cca92e2 SHA256 283f4dd10a8cbd3b22a917be642055ec315cd9aa342b290dba30e5227384d8e2
 MD5 62b78b485b34b1e601e6dceb06bad8b5 e2fsprogs-1.38-r1.ebuild 4471
 RMD160 41bb370af6a8e35e58554823c7753e9b8687cbcc e2fsprogs-1.38-r1.ebuild 4471
 SHA256 283f4dd10a8cbd3b22a917be642055ec315cd9aa342b290dba30e5227384d8e2 e2fsprogs-1.38-r1.ebuild 4471
-EBUILD e2fsprogs-1.39.ebuild 4014 RMD160 dfdf19f2613265562977ca72517ff6a920164554 SHA1 97118b027ed5aa5936e369dc742997504173c37d SHA256 dffd39b6871e5469e26df6aa3048c1527bed3e7dced3a71be286a7ee50c5d870
-MD5 446ebd131483df56668592c72910672b e2fsprogs-1.39.ebuild 4014
-RMD160 dfdf19f2613265562977ca72517ff6a920164554 e2fsprogs-1.39.ebuild 4014
-SHA256 dffd39b6871e5469e26df6aa3048c1527bed3e7dced3a71be286a7ee50c5d870 e2fsprogs-1.39.ebuild 4014
-MISC ChangeLog 14833 RMD160 c289eba9c195f10bc5be5aac73396f1c7fc70443 SHA1 83db3232da5ca5485b3539c3cf786a5006227c5e SHA256 6756d470e638311c6d56d5e4dbf2ad990c15b79b889e54e5c2f441d76c8698e1
-MD5 a6dc35045baf598e1aa656c45bcd60b7 ChangeLog 14833
-RMD160 c289eba9c195f10bc5be5aac73396f1c7fc70443 ChangeLog 14833
-SHA256 6756d470e638311c6d56d5e4dbf2ad990c15b79b889e54e5c2f441d76c8698e1 ChangeLog 14833
+EBUILD e2fsprogs-1.39.ebuild 4077 RMD160 5e98d84099f7b0010007bba62a21c2344c611f41 SHA1 1b9a2804c5a38adff696f5e51f9ea7f640b613cd SHA256 f5cd3c0c06c09fd8bdb2cc2582838de99ba7b3aeaae1d2e4c9cb81779cdd71c8
+MD5 d99ec9b2c6936b367da0485d1ca20539 e2fsprogs-1.39.ebuild 4077
+RMD160 5e98d84099f7b0010007bba62a21c2344c611f41 e2fsprogs-1.39.ebuild 4077
+SHA256 f5cd3c0c06c09fd8bdb2cc2582838de99ba7b3aeaae1d2e4c9cb81779cdd71c8 e2fsprogs-1.39.ebuild 4077
+MISC ChangeLog 15004 RMD160 42f47b454cee320e57e1cc6116e6143f71ad710a SHA1 8667d2d626f72bbe21ff65e92928f117c117cdae SHA256 57c7371024c12995b51d731b781d379eee3e52e0b2f9d2dd9ad202a7dc166666
+MD5 698f78eb222f80809874ffe1e3e7789b ChangeLog 15004
+RMD160 42f47b454cee320e57e1cc6116e6143f71ad710a ChangeLog 15004
+SHA256 57c7371024c12995b51d731b781d379eee3e52e0b2f9d2dd9ad202a7dc166666 ChangeLog 15004
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -66,9 +70,9 @@ MD5 fc00317ae73d9c2807fd61dff454474c files/digest-e2fsprogs-1.39 247
 RMD160 7fc0216dd2eb0963650054e763b94a26a3214c6a files/digest-e2fsprogs-1.39 247
 SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/digest-e2fsprogs-1.39 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEzt06amhnQswr0vIRAn+LAJ9brzPfhNc+81iYfLD5dxybde+ZlQCdFyS9
-5bivuyvT6g8turL3f+NgQbM=
-=h+YA
+iD8DBQFFApdYamhnQswr0vIRAgOlAKCFtlsv//9KqBFCvanbRrLro47Z+ACgiPeA
+NofvPYWrmPOgCWUI3KRU7lw=
+=j0tv
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
index 0ac4c608e32a..55e7ffe3a985 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.1 2006/08/01 04:48:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.2 2006/09/09 10:28:27 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -42,6 +42,7 @@ src_unpack() {
 	chmod u+w po/*.po # Userpriv fix #27348
 	# Clean up makefile to suck less
 	epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+	epatch "${FILESDIR}"/e2fsprogs-1.39-parse-types.patch #146903
 
 	# Fixes libintl handling on non-glibc #122368
 	epatch "${FILESDIR}"/${PN}-1.39-libintl.patch
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-parse-types.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-parse-types.patch
new file mode 100644
index 000000000000..8af9128d6591
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-parse-types.patch
@@ -0,0 +1,53 @@
+make this script suck less:
+ - dont use known files in /tmp
+ - dont use absolute paths to headers
+ - dont hardcode gcc/cc
+ - dont spit out warnings about incompat func types
+
+http://bugs.gentoo.org/146903
+
+--- config/parse-types.sh
++++ config/parse-types.sh
+@@ -1,27 +1,20 @@
+ #!/bin/sh
+ 
+-ASM_TYPES=/usr/include/asm/types.h
+-
+-if test ! -f $ASM_TYPES
+-then
+-    echo "" > asm_types.h
+-    echo "No asm_types file found"
+-    exit 1
+-fi
+-
+-cat > /tmp/sed.script << "EOF"
++echo '#include <asm/types.h>' | ${CPP-${CC-gcc} -E} - | sed \
++"
+ /^#/d
+ /^$/d
+ s/__extension__ //
+ s/typedef \(.*\) __u\([1-9]*\);/#define __U\2_TYPEDEF \1/
+ s/typedef \(.*\) __s\([1-9]*\);/#define __S\2_TYPEDEF \1/
+-EOF
+-
+-gcc -E $ASM_TYPES | sed -f /tmp/sed.script | grep ^# > asm_types.h
++" \
++| grep ^# > asm_types.h
+ 
+ cp asm_types.h asm_types.c
+ 
+ cat >> asm_types.c <<EOF
++#include <stdio.h>
++#include <stdlib.h>
+ main(int argc, char **argv)
+ {
+ #ifdef __U8_TYPEDEF
+@@ -102,7 +95,7 @@
+ }
+ EOF
+ 
+-cc -o asm_types asm_types.c
++${BUILD_CC-gcc} -o asm_types asm_types.c
+ if ! ./asm_types 
+ then
+     echo "Problem detected with asm_types.h"