Respect user settings #157785/#157786 by Diego Pettenò.

Package-Manager: portage-2.1.2_rc3

4 files changed, 51 insertions, 14 deletions

diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog
index bb1dc1506839..a8df819ddee4 100644
--- a/sys-fs/dosfstools/ChangeLog
+++ b/sys-fs/dosfstools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/dosfstools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.35 2006/10/05 16:27:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.36 2006/12/14 05:47:33 vapier Exp $
+
+  14 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/dosfstools-2.11-build.patch, dosfstools-2.11-r2.ebuild:
+  Respect user settings #157785/#157786 by Diego Pettenò.
 
 *dosfstools-2.11-r2 (05 Oct 2006)
 
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 295c4fd40901..0222a0c9e3f2 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dosfstools-2.10-2.6.headers.patch 740 RMD160 6a6a12403a73dca6d23ccc2ca0b93bf5613ad546 SHA1 86f8c75d93696559f46d4fb481dccdb12e465bcc SHA256 11f08c1f6f56f0cbb017a92825c6de03df94cf736da01683fe7e6f261d385b16
 MD5 15e58786d8b78987b6ff2b5b4850bd4b files/dosfstools-2.10-2.6.headers.patch 740
 RMD160 6a6a12403a73dca6d23ccc2ca0b93bf5613ad546 files/dosfstools-2.10-2.6.headers.patch 740
@@ -6,6 +9,10 @@ AUX dosfstools-2.10-lseek64.patch 5650 RMD160 14732171e0e66200b3e457ea08be9fada4
 MD5 1892bf8b14475bb28ecd9c09492ba854 files/dosfstools-2.10-lseek64.patch 5650
 RMD160 14732171e0e66200b3e457ea08be9fada452740e files/dosfstools-2.10-lseek64.patch 5650
 SHA256 7a69a7e66935bb03c2613eae82ed30c984cd7be39d3aebf41b8c696d08678b50 files/dosfstools-2.10-lseek64.patch 5650
+AUX dosfstools-2.11-build.patch 417 RMD160 ab742b6c75c4da972c083992b5da3b6988aee2e1 SHA1 d7f1ebe4d2571530ed5dfee7b19eaead85c45c5f SHA256 e596839e876e1fdfebae48c800261c50f1490462d4a10a596c6fc1b3b18b38dd
+MD5 5da8a54f5cd74174584822dc398bc35a files/dosfstools-2.11-build.patch 417
+RMD160 ab742b6c75c4da972c083992b5da3b6988aee2e1 files/dosfstools-2.11-build.patch 417
+SHA256 e596839e876e1fdfebae48c800261c50f1490462d4a10a596c6fc1b3b18b38dd files/dosfstools-2.11-build.patch 417
 AUX dosfstools-2.11-fat32size.patch 1428 RMD160 7434905b76773c0e955285677af4c6ed3ca21f54 SHA1 66544b700ba7105d1fc8912064d38a50651e5162 SHA256 f2d205fbfbf6a6cb7efb97886e11644b7413a5683b0af154128e496679a1f061
 MD5 c60c859ba61e196767e00c2c1071931d files/dosfstools-2.11-fat32size.patch 1428
 RMD160 7434905b76773c0e955285677af4c6ed3ca21f54 files/dosfstools-2.11-fat32size.patch 1428
@@ -23,18 +30,18 @@ EBUILD dosfstools-2.11-r1.ebuild 1161 RMD160 2ca9e1813a477d71882c486c21a264efbbd
 MD5 ceedeccf6b8f30ee76a3aa18eba05920 dosfstools-2.11-r1.ebuild 1161
 RMD160 2ca9e1813a477d71882c486c21a264efbbd70668 dosfstools-2.11-r1.ebuild 1161
 SHA256 7b0defc5c305ecfed58abc38134bfe1d412914492e37dddd82f2451a25553c22 dosfstools-2.11-r1.ebuild 1161
-EBUILD dosfstools-2.11-r2.ebuild 1243 RMD160 3cebc709ca021e6f2695599277ba27e2ecdcfb74 SHA1 d04b7c52636fdf63ccd0b2e79fb2f7d9b10b0989 SHA256 20e0230fb869cb300016cb7f9e91a4773fc8082fb5da99d3669ec570c61b4319
-MD5 b24d833bca76f03091e4672d5c8ba910 dosfstools-2.11-r2.ebuild 1243
-RMD160 3cebc709ca021e6f2695599277ba27e2ecdcfb74 dosfstools-2.11-r2.ebuild 1243
-SHA256 20e0230fb869cb300016cb7f9e91a4773fc8082fb5da99d3669ec570c61b4319 dosfstools-2.11-r2.ebuild 1243
+EBUILD dosfstools-2.11-r2.ebuild 1228 RMD160 fb3f16000563418d6e2ab9ed930360888fb8a7b6 SHA1 dd39eca00c0ffc3fdede4ad877741fdb53181eaa SHA256 deb04fae69512eff0857f601eb501c673ca8ee795e6e41a8a5105dc6e731d84c
+MD5 0e6970f87598edabd12922e34b55063f dosfstools-2.11-r2.ebuild 1228
+RMD160 fb3f16000563418d6e2ab9ed930360888fb8a7b6 dosfstools-2.11-r2.ebuild 1228
+SHA256 deb04fae69512eff0857f601eb501c673ca8ee795e6e41a8a5105dc6e731d84c dosfstools-2.11-r2.ebuild 1228
 EBUILD dosfstools-2.11.ebuild 1068 RMD160 547079e5d69bd3397f4342960d13245bae06b2f6 SHA1 9bac027013e7d5565959a6c2203c8af8dec8dbec SHA256 07e3778b5897871c2678a366d19f8cd894e8feccd73e566f45d6727be615b38f
 MD5 6a51d37ec4e02a6fa41c6569916a6329 dosfstools-2.11.ebuild 1068
 RMD160 547079e5d69bd3397f4342960d13245bae06b2f6 dosfstools-2.11.ebuild 1068
 SHA256 07e3778b5897871c2678a366d19f8cd894e8feccd73e566f45d6727be615b38f dosfstools-2.11.ebuild 1068
-MISC ChangeLog 5624 RMD160 fd221c8d46a2cd6012c1e32827efb4236adf8d79 SHA1 50f1c6dcb2f5fb1e6b7395b88a7882bd351a5ba4 SHA256 3fd4a162e74a44498d82c86286576ad9a187ca074257c0f8b7ce742fe2270f77
-MD5 510f8a97ce354d40f366b7de684071ff ChangeLog 5624
-RMD160 fd221c8d46a2cd6012c1e32827efb4236adf8d79 ChangeLog 5624
-SHA256 3fd4a162e74a44498d82c86286576ad9a187ca074257c0f8b7ce742fe2270f77 ChangeLog 5624
+MISC ChangeLog 5798 RMD160 07fbf0e972c7f38c5c0fb50a988ab7285b71d889 SHA1 81135cf86c46e54a479d1c6e5bc7301f40a7daad SHA256 da74937b2237be113fdd18915fdff8e8dedbba7ef9739805236b40309309428a
+MD5 e0d8f253aa240f857a4d817096e26c3b ChangeLog 5798
+RMD160 07fbf0e972c7f38c5c0fb50a988ab7285b71d889 ChangeLog 5798
+SHA256 da74937b2237be113fdd18915fdff8e8dedbba7ef9739805236b40309309428a ChangeLog 5798
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -48,3 +55,10 @@ SHA256 c946bca113e3ab1d84c98a99bfffc26fb49bf3edd28b8376fe74eefcc07ab1d5 files/di
 MD5 3c7a4ddc11c30509a29c1c99df7471d4 files/digest-dosfstools-2.11-r2 256
 RMD160 c3071a1984b8de8aa722fc0bf1854ecd59563e9a files/digest-dosfstools-2.11-r2 256
 SHA256 c946bca113e3ab1d84c98a99bfffc26fb49bf3edd28b8376fe74eefcc07ab1d5 files/digest-dosfstools-2.11-r2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFgOW0amhnQswr0vIRAiUKAKCbykJdLkBeZt0jjC+IShPf93sfDgCfRjVm
+uPBqq6ReEFqAMTp4y6CLDq8=
+=nhgX
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild
index 685438a0d6d1..c8fb6d5f598e 100644
--- a/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild
+++ b/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild,v 1.1 2006/10/05 16:27:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild,v 1.2 2006/12/14 05:47:34 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
 HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/"
@@ -24,16 +24,16 @@ src_unpack() {
 		Makefile || die "sed Makefile"
 	epatch "${FILESDIR}"/dosfstools-2.11-fat32size.patch
 	epatch "${FILESDIR}"/dosfstools-2.11-verify-double-count-fix.patch
+	epatch "${FILESDIR}"/dosfstools-2.11-build.patch
 }
 
 src_compile() {
-	# this package does *not* play well with optimisations
-	# please dont change to: make OPTFLAGS="${CFLAGS}"
+	tc-export CC
 	emake -j1 || die
 }
 
 src_install() {
-	make PREFIX="${D}"/usr install || die
+	emake PREFIX="${D}"/usr install || die
 	dodoc CHANGES TODO
 	newdoc dosfsck/README README.dosfsck
 	newdoc dosfsck/CHANGES CHANGES.dosfsck
diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-build.patch b/sys-fs/dosfstools/files/dosfstools-2.11-build.patch
new file mode 100644
index 000000000000..2d037ad506b6
--- /dev/null
+++ b/sys-fs/dosfstools/files/dosfstools-2.11-build.patch
@@ -0,0 +1,19 @@
+--- Makefile
++++ Makefile
+@@ -2,13 +2,12 @@
+ # Makefile for dosfstools (mkdosfs and dosfsck)
+ #
+ 
+-CC = gcc
++CC ?= gcc
+ CPP = $(CC) -E
+-OPTFLAGS = -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
++OPTFLAGS = -D_FILE_OFFSET_BITS=64
+ WARNFLAGS = -Wall
+ DEBUGFLAGS = 
+-CFLAGS = $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
+-LDFLAGS =
++CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
+ 
+ PREFIX =/usr 
+ SBINDIR = $(PREFIX)/sbin