Respect LDFLAGS (bug #331785). Move dosed scripts to src_prepare and make sure they are run properly. Respect CC. Respect CFLAGS. Whitespace.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 78 insertions, 2 deletions

diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog
index db341f07f0f2..b16631bb350b 100644
--- a/mail-filter/gld/ChangeLog
+++ b/mail-filter/gld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/gld
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.43 2010/06/17 21:36:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.44 2010/08/11 01:35:43 jer Exp $
+
+*gld-1.7-r1 (11 Aug 2010)
+
+  11 Aug 2010; Jeroen Roovers <jer@gentoo.org> +gld-1.7-r1.ebuild:
+  Respect LDFLAGS (bug #331785). Move dosed scripts to src_prepare and make
+  sure they are run properly. Respect CC. Respect CFLAGS. Whitespace.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> gld-1.7.ebuild:
   Migrating away from deprecated postgres virtuals
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 690bcd4874b2..dbdba2ed17ef 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,6 +1,7 @@
 AUX gld.rc 544 RMD160 b0d668ffa01f39ffe7de1b4c805a792607fd434d SHA1 28c3bf17168382fe89c8db2763af3f7723ae3b59 SHA256 040837f1a16f8f6cf72f9f051322e46b4cacad8cc0a97de217e64a42efda03dc
 AUX tables.sql 1141 RMD160 02d45dbe928c545d27839ae052c23f5dcf13299b SHA1 5d0911dae9f14ecc627f8ef05c5b664240622ecc SHA256 4066abd57f4b460041abe36585cbd8cb8e8aae863ff288ce05b2a5788c2f79f5
 DIST gld-1.7.tgz 40241 RMD160 0e8190a668ecd88e19c22aa1f80d9a442d1101cf SHA1 e3a792f6992d063e9d93ce4183f821d78f6cb29f SHA256 c0776f6841afa73b6579e355522d79fd15467de2936f1a4464265e6415cae14b
+EBUILD gld-1.7-r1.ebuild 1670 RMD160 d2063d125b4aad71d8296d97e129b69606596d6a SHA1 66c7f7e4ed86cbafc9b135fc8eb1416fe19e75d6 SHA256 42f8891e31d442701fed2307f8a333a0eb2805f7b1336caeffd592866611c811
 EBUILD gld-1.7.ebuild 1488 RMD160 4a7e04177b81f791d10c8df8a13d3ab7c422b739 SHA1 caa7a31a87d2df8a940696755fd280ea16066f0a SHA256 bd2ce255dc1ad725435c0966c6a2ce3d092fd03eee23260d373788ce2035b450
-MISC ChangeLog 6435 RMD160 b6aa1c62afafa0a75e1aa478ac84bf9f81d71226 SHA1 df03998adb82e3262c878871ac824742fe31e7dd SHA256 663589067b4a4f6ea5b11dd5cc2739fde00073cbb73ed2be69f58648ee1cab11
+MISC ChangeLog 6672 RMD160 52368ff5eca1f9cba1402670f0f94cff43956710 SHA1 9fa6daff55dcd0655a423bd74b1cac200158188a SHA256 51f647227f8031da001209b6404927e5acd5cc384c5291dcb2551a0517aaaa91
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-filter/gld/gld-1.7-r1.ebuild b/mail-filter/gld/gld-1.7-r1.ebuild
new file mode 100644
index 000000000000..466d2cdd9a67
--- /dev/null
+++ b/mail-filter/gld/gld-1.7-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.7-r1.ebuild,v 1.1 2010/08/11 01:35:43 jer Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
+HOMEPAGE="http://www.gasmi.net/gld.html"
+SRC_URI="http://www.gasmi.net/down/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="postgres"
+# Not adding a mysql USE flag. The package defaults to it, so we will too.
+DEPEND="sys-libs/zlib
+	>=dev-libs/openssl-0.9.6
+	postgres? ( dev-db/postgresql-server )
+	!postgres? ( virtual/mysql )"
+
+src_prepare() {
+	sed -i gld.conf \
+		-e 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' \
+		-e 's:^#USER=.*:USER=nobody:' \
+		-e 's:^#GROUP=.*:GROUP=nobody:' \
+		|| die "sed gld.conf failed"
+
+	sed -i Makefile.in \
+		-e '/ -c /{s|-O2|$(CFLAGS)|g}' \
+		-e '/ -o /{s|-O2|$(CFLAGS) $(LDFLAGS)|g}' \
+		-e '/strip/d' \
+		|| die "sed Makefile.in failed"
+}
+
+src_configure() {
+	tc-export CC
+	# It's kind of weird. $(use_with postgres pgsql) won't work if you don't
+	# use it...
+	if use postgres ; then
+		myconf="${myconf} --with-pgsql"
+	fi
+
+	econf ${myconf} || die "econf failed"
+}
+
+src_install() {
+	dobin gld
+
+	insinto /etc
+	newins gld.conf gld.conf.example
+
+	dodoc HISTORY README*
+
+	insinto /usr/share/${PN}/sql
+	doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
+
+	newinitd "${FILESDIR}"/gld.rc gld
+}
+
+pkg_postinst() {
+	elog
+	elog "Please read the README file in /usr/share/doc/${PF} for"
+	elog "details on how to setup gld."
+	elog
+	elog "The sql files have been installed to /usr/share/${PN}/sql."
+	elog
+}