summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2010-07-12 09:47:09 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2010-07-12 09:47:09 +0000
commit886a885ae4c65c6e8e2f66761b00ae5b520b46f5 (patch)
treeed08c6175a9cdfa1923d83149a2776e75b87bb32 /dev-haskell/hdoc
parentRevision bump for usb-modeswitch-data-20100707. (diff)
downloadhistorical-886a885ae4c65c6e8e2f66761b00ae5b520b46f5.tar.gz
historical-886a885ae4c65c6e8e2f66761b00ae5b520b46f5.tar.bz2
historical-886a885ae4c65c6e8e2f66761b00ae5b520b46f5.zip
Fixed bug #251888. QA: pre-stripped files found
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-haskell/hdoc')
-rw-r--r--dev-haskell/hdoc/ChangeLog9
-rw-r--r--dev-haskell/hdoc/Manifest5
-rw-r--r--dev-haskell/hdoc/files/hdoc-0.8.3-remove-strip.patch32
-rw-r--r--dev-haskell/hdoc/hdoc-0.8.3.ebuild10
4 files changed, 49 insertions, 7 deletions
diff --git a/dev-haskell/hdoc/ChangeLog b/dev-haskell/hdoc/ChangeLog
index a5c67a763a07..c3a0bd13db96 100644
--- a/dev-haskell/hdoc/ChangeLog
+++ b/dev-haskell/hdoc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/hdoc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdoc/ChangeLog,v 1.17 2007/12/13 18:03:17 dcoutts Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdoc/ChangeLog,v 1.18 2010/07/12 09:47:09 slyfox Exp $
+
+ 12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hdoc-0.8.3.ebuild,
+ +files/hdoc-0.8.3-remove-strip.patch:
+ Fixed QA warning (pre-stripped files found) found by Diego E. 'Flameeyes'
+ Pettenò <flameeyes@gentoo.org> (bug #251888)
13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hdoc-0.8.3.ebuild:
Fix quoting in ebuild.
diff --git a/dev-haskell/hdoc/Manifest b/dev-haskell/hdoc/Manifest
index ac19fb3621d6..abb9193be0c0 100644
--- a/dev-haskell/hdoc/Manifest
+++ b/dev-haskell/hdoc/Manifest
@@ -1,4 +1,5 @@
+AUX hdoc-0.8.3-remove-strip.patch 857 RMD160 9ef06077751e11b0475eca14909762b04f73acc8 SHA1 ff67360f2d686e81f0b65a4b69aafe4a570d1801 SHA256 e5bda9425d58428cf5490feb4741b9366cfdb3ab755b5abe85111dde22e99723
DIST hdoc-0.8.3.tar.gz 215193 RMD160 d7c96342a650e20793560a1e9ea197da389e5e44 SHA1 5d229fdc5b85b418ad7074eb2828d0d11e78ff9e SHA256 eeaedeefd93dc2b4d21f71dce025dff493b38e7a3c1610485f256a8a8b62b07d
-EBUILD hdoc-0.8.3.ebuild 755 RMD160 be042d6fe534ed1b3b76240f1faca7099defcf83 SHA1 df926032a3f5b9006d49e68caa68d9e3c3b2c16d SHA256 678919a60c5c6c123b3267422b894e2936969ec26d954778d3ec3c69ee5b88c2
-MISC ChangeLog 2049 RMD160 8e4372b7af33294bc9b487e07857e53c50ea5a09 SHA1 ea65cc6cc05d7df4bb1498c6a0ceb46ea824a1c3 SHA256 a0f4e15788fc1475ff23047fd31538e680c30e6d82b74f51e1d057531a7f0499
+EBUILD hdoc-0.8.3.ebuild 822 RMD160 80235178fe57c9c70604b0dc77cb24e75fe922d5 SHA1 7cd3b69bd05b10d5459fd3e1a80a5c13f29a68c2 SHA256 c9b6a4b4b7392ddd5a16617d93470a58a10c29b382fea806fc1d02b595b21819
+MISC ChangeLog 2286 RMD160 e2c2af73958ee2aa2448cbc32fde7a446dd91bfa SHA1 bd54f3648fc3f8edc8e667244a0043a2cd96fffb SHA256 17134c521e7aff372c6b6b9635086c83704d5d8f7792fc3a25949906d045bfe3
MISC metadata.xml 506 RMD160 13cd894ceb6634548fe4bed73d0e8f874845115a SHA1 b4c85a30846ad0a60971e86196ba949429d8b74d SHA256 7df60edebf9de08766f4c93c7466ff5bd3335bbef50ea0f0da05ffe29b7ccf36
diff --git a/dev-haskell/hdoc/files/hdoc-0.8.3-remove-strip.patch b/dev-haskell/hdoc/files/hdoc-0.8.3-remove-strip.patch
new file mode 100644
index 000000000000..905570052a87
--- /dev/null
+++ b/dev-haskell/hdoc/files/hdoc-0.8.3-remove-strip.patch
@@ -0,0 +1,32 @@
+Reported by Diego: https://bugs.gentoo.org/show_bug.cgi?id=251888
+dev-haskell/hdoc-0.8.3:20081213-031033.log: * QA Notice: Pre-stripped files
+found:
+dev-haskell/hdoc-0.8.3:20081213-031033.log: *
+/var/tmp/portage/dev-haskell/hdoc-0.8.3/image/usr/bin/hdoc
+
+Patch removed direct strip calls from Evil Makefile.
+diff --git a/Makefile.in b/Makefile.in
+index 436ad12..1cc3f71 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,20 +42,17 @@ hdoc: @BUILD@
+ .PHONY: ghc5
+ ghc5: gen
+ $(GHC) -o $(HDOC) $(GHC_OPTS) --make Main
+- $(STRIP) $(HDOC)
+
+ .PHONY: hmake-ghc
+ hmake-ghc: gen
+ $(HMAKE) -HC=$(GHC) $(GHC_OPTS) Main
+ mv Main $(HDOC)
+- $(STRIP) $(HDOC)
+
+ # NHC98 can now compile HDoc just fine :-)
+ .PHONY: hmake-nhc98
+ hmake-nhc98: gen
+ $(HMAKE) -HC=$(NHC98) $(NHC98_OPTS) Main
+ mv Main $(HDOC)
+- $(STRIP) $(HDOC)
+
+ Scanner.hs: Scanner.x
+ $(ALEX) $< $@
diff --git a/dev-haskell/hdoc/hdoc-0.8.3.ebuild b/dev-haskell/hdoc/hdoc-0.8.3.ebuild
index 24ab2e72f78e..7981c8754030 100644
--- a/dev-haskell/hdoc/hdoc-0.8.3.ebuild
+++ b/dev-haskell/hdoc/hdoc-0.8.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdoc/hdoc-0.8.3.ebuild,v 1.12 2007/12/13 18:03:17 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdoc/hdoc-0.8.3.ebuild,v 1.13 2010/07/12 09:47:09 slyfox Exp $
+
+inherit base
DESCRIPTION="A documentation generator for Haskell"
HOMEPAGE="http://www.fmi.uni-passau.de/~groessli/hdoc/"
@@ -14,12 +16,14 @@ IUSE=""
DEPEND="dev-lang/ghc"
RDEPEND=""
+PATCHES=("${FILESDIR}/hdoc-0.8.3-remove-strip.patch")
+
src_compile() {
econf --with-compiler=ghc || die "econf failed"
emake || die "emake failed"
}
-src_install () {
+src_install() {
# DESTDIR does not work, but only bindir is used ...
make bindir="${D}/usr/bin" install || die "installation failed"
dodoc docs/hdoc.pdf