respect LDFLAGS wrt bug #339110

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 111 insertions, 2 deletions

diff --git a/sys-block/spindown/ChangeLog b/sys-block/spindown/ChangeLog
index a869f17fe2dd..2186e3f193c8 100644
--- a/sys-block/spindown/ChangeLog
+++ b/sys-block/spindown/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/spindown
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/spindown/ChangeLog,v 1.7 2012/01/01 01:04:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/spindown/ChangeLog,v 1.8 2012/03/11 11:38:51 wschlich Exp $
+
+*spindown-0.4.0-r4 (11 Mar 2012)
+
+  11 Mar 2012; Wolfram Schlich <wschlich@gentoo.org> +spindown-0.4.0-r4.ebuild,
+  +files/spindown-0.4.0-CFLAGS-LDFLAGS.patch:
+  respect LDFLAGS wrt bug #339110
 
 *spindown-0.4.0-r3 (01 Jan 2012)
 *spindown-0.4.0-r2 (01 Jan 2012)
diff --git a/sys-block/spindown/Manifest b/sys-block/spindown/Manifest
index 1e7d1e955323..ae4ce40fa720 100644
--- a/sys-block/spindown/Manifest
+++ b/sys-block/spindown/Manifest
@@ -1,3 +1,4 @@
+AUX spindown-0.4.0-CFLAGS-LDFLAGS.patch 1877 RMD160 c65f61d1b6b5a02ae24ee8e74fa35775465086a9 SHA1 54892a4b90d14f31dd904161d33c3ea235197511 SHA256 253207ebbecdde180100ecfd5723c17c849e378ca594242c644b4c225be8dfb9
 AUX spindown-0.4.0-CFLAGS.patch 432 RMD160 3e08d08669ed504c9020625983da3db4677994a4 SHA1 00a3157b0df842037137e85650478a43dab4de33 SHA256 65ea67e351f89e38361ff8adb8e0316c463e09a99eab1fbbc991a25fc9a259b1
 AUX spindownd.confd 360 RMD160 14b2e4d09779d722bb972ba907a0695ab9b7d59e SHA1 ee05aeda29a8421018e135a4820fb5cd1bc5c286 SHA256 19e68b582815183321b8480df62d42c39aef1094b6b49cff0993129e8276c840
 AUX spindownd.confd-r1 270 RMD160 4f8384f6e7cd409839bed5e794c52e16340d72ed SHA1 b75732a6634296037ff657f9ec4eb75d5e8c1f45 SHA256 aa2be7aa60f5483400a4dea50e18007ffee3092113ac5e0188c1dd16ec0ff71e
@@ -6,5 +7,6 @@ AUX spindownd.initd-r1 1509 RMD160 2545a8ca98e28c38b225b1e8e74ba5f24d443255 SHA1
 DIST spindown-0.4.0.tar.gz 36837 RMD160 65ea951fed9d3ee202330cba99f0f74b06cd6d7f SHA1 b0e3d5348dcfcddcc833354d507b07d9a86a51b5 SHA256 551167e3d0a20cb56d3729ae91cf831a4faae2d1287c7f205bbc2f1d011ec37b
 EBUILD spindown-0.4.0-r2.ebuild 1145 RMD160 1edf3abe87e466ce618b957b9db1ed8948861fc8 SHA1 27cfd59f9a509bbd7da10e2e383c87513983b857 SHA256 6c94917cef098f5e68778713d30cc5004be602fa72333c7dfe9cdb41fdbc4702
 EBUILD spindown-0.4.0-r3.ebuild 1151 RMD160 532274d85aa94e4ee7bf0d89177e837259bf075c SHA1 78320d4ab69a893db38c1798554eb44d61871e3a SHA256 d148f69f8c65e9dcd813347a37a28a8dd962607e88104593952e046f0904b4fd
-MISC ChangeLog 1548 RMD160 ed193b13e1d7292f6fb2abe8e23770e71273392a SHA1 d286bd07536d9987c662819a928fe3b6143d9e89 SHA256 1c980c848f5948b9488f309a39566a4de87d568c2a5d40f5442700faceb92d67
+EBUILD spindown-0.4.0-r4.ebuild 1162 RMD160 d3882379618fb022f5e26d2b9d12977e0c389b9c SHA1 514b8b8510cc1d6f9732c917f416880403e3a11d SHA256 fc5af405b79eb60c7130a86ad38a07b34746815f50b9a8f2b2493ccacf3c8373
+MISC ChangeLog 1746 RMD160 1ffdc805ffbe94443495ed2482d423d68a985f9b SHA1 bd8491c44e0b1b335a6654181f4101d4e58dad54 SHA256 1eeb8def99c882ae50da67d6a84aea80f9999de37daac2a7f9227491c2e830bd
 MISC metadata.xml 279 RMD160 f846b17ad561413ef51ee6a03fe42b7a8a6b1cd5 SHA1 dfb2a47e96ef13433271e97bc56464dea5c6bcf4 SHA256 7c74650dc3e4a376f9773d800c84d604950eb1ad23fee11a8e1c982f6ccd57e0
diff --git a/sys-block/spindown/files/spindown-0.4.0-CFLAGS-LDFLAGS.patch b/sys-block/spindown/files/spindown-0.4.0-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..9101fbadb59c
--- /dev/null
+++ b/sys-block/spindown/files/spindown-0.4.0-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,55 @@
+diff -urN spindown-0.4.0.orig/Makefile spindown-0.4.0/Makefile
+--- spindown-0.4.0.orig/Makefile	2009-04-18 18:32:59.000000000 +0200
++++ spindown-0.4.0/Makefile	2012-03-11 00:22:07.684197769 +0100
+@@ -4,7 +4,8 @@
+ OBJS = main.o diskset.o disk.o spindown.o iniparser.o dictionary.o log.o spindownd.o\
+         exceptions.o
+ CC = g++
+-CFLAGS =-O1
++CFLAGS +=
++LDFLAGS +=
+ SRC = src/
+ INPARSER = $(SRC)ininiparser3.0b/
+ SRCDIR = spindown-$(VERSION)
+@@ -60,31 +61,31 @@
+ 	rm -d -r -f $(SRCDIR)
+ 
+ spindownd: $(OBJS)
+-	g++ $(CFLAGS) -o spindownd $(OBJS)
++	g++ $(CFLAGS) $(LDFLAGS) -o spindownd $(OBJS)
+ 
+ main.o: $(SRC)main.cpp $(SRC)general.h
+-	g++ $(CFLAGS) -c $(SRC)main.cpp
++	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)main.cpp
+ 
+ diskset.o: $(SRC)diskset.cpp $(SRC)diskset.h $(SRC)general.h
+-	g++ $(CFLAGS) -c $(SRC)diskset.cpp
++	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)diskset.cpp
+ 
+ disk.o: $(SRC)disk.cpp $(SRC)disk.h $(SRC)general.h
+-	g++ $(CFLAGS) -c $(SRC)disk.cpp
++	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)disk.cpp
+ 
+ spindown.o: $(SRC)spindown.cpp $(SRC)spindown.h $(SRC)general.h
+-	g++ $(CFLAGS) -c $(SRC)spindown.cpp
++	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)spindown.cpp
+ 
+ spindownd.o: $(SRC)spindownd.cpp $(SRC)spindownd.h $(SRC)general.h
+-	g++ $(CFLAGS) -c $(SRC)spindownd.cpp
++	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)spindownd.cpp
+ 
+ log.o: $(SRC)log.cpp $(SRC)log.h $(SRC)general.h
+-	g++ $(CFLAGS) -c $(SRC)log.cpp
++	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)log.cpp
+ 
+ exceptions.o: $(SRC)exceptions.cpp $(SRC)exceptions.h $(SRC)general.h
+-	g++ $(CFLAGS) -c $(SRC)exceptions.cpp
++	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)exceptions.cpp
+ 
+ iniparser.o: $(INPARSER)iniparser.c
+-	g++ $(CFLAGS) -c $(INPARSER)iniparser.c
++	g++ $(CFLAGS) $(LDFLAGS) -c $(INPARSER)iniparser.c
+ 
+ dictionary.o: $(INPARSER)dictionary.c
+-	g++ $(CFLAGS) -c $(INPARSER)dictionary.c
++	g++ $(CFLAGS) $(LDFLAGS) -c $(INPARSER)dictionary.c
diff --git a/sys-block/spindown/spindown-0.4.0-r4.ebuild b/sys-block/spindown/spindown-0.4.0-r4.ebuild
new file mode 100644
index 000000000000..95007a3c9dc5
--- /dev/null
+++ b/sys-block/spindown/spindown-0.4.0-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/spindown/spindown-0.4.0-r4.ebuild,v 1.1 2012/03/11 11:38:51 wschlich Exp $
+
+inherit eutils
+
+DESCRIPTION="Spindown is a daemon that can spin down idle disks"
+HOMEPAGE="http://code.google.com/p/spindown"
+SRC_URI="http://spindown.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	sys-apps/sg3_utils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-CFLAGS-LDFLAGS.patch
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	insinto /etc
+	newins spindown.conf.example spindown.conf
+	newinitd "${FILESDIR}"/spindownd.initd-r1 spindownd
+	newconfd "${FILESDIR}"/spindownd.confd-r1 spindownd
+	dosbin spindownd
+	dodoc CHANGELOG README TODO spindown.conf.example
+}
+
+pkg_postinst() {
+	elog "Before starting spindownd the first time"
+	elog "you should modify /etc/spindown.conf"
+	elog
+	elog "To start spindownd by default"
+	elog "you should add it to the default runlevel:"
+	elog "  rc-update add spindownd default"
+}