Fix db engines use flags and CGIs, also works now with gnupg-2, thank to maxim for his help

(Portage version: 2.1.2.7)

6 files changed, 57 insertions, 66 deletions

diff --git a/app-crypt/onak/ChangeLog b/app-crypt/onak/ChangeLog
index 63dc447a7e80..ff3da1931f3d 100644
--- a/app-crypt/onak/ChangeLog
+++ b/app-crypt/onak/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/onak
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/ChangeLog,v 1.3 2007/05/22 15:43:29 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/ChangeLog,v 1.4 2007/05/23 14:19:53 alonbl Exp $
+
+*onak-0.3.3-r1 (23 May 2007)
+
+  23 May 2007; Alon Bar-Lev <alonbl@gentoo.org> -onak-0.3.2.ebuild,
+  -onak-0.3.3.ebuild, +onak-0.3.3-r1.ebuild:
+  Fix db engines use flags and CGIs, also works now with gnupg-2, thank to
+  maxim for his help
 
 *onak-0.3.3 (22 May 2007)
 
diff --git a/app-crypt/onak/files/digest-onak-0.3.2 b/app-crypt/onak/files/digest-onak-0.3.2
deleted file mode 100644
index 10d5887d7b8e..000000000000
--- a/app-crypt/onak/files/digest-onak-0.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c94194e6ad0ddcef321e53bfcaff3bbe onak-0.3.2.tar.gz 173462
-RMD160 290a0dc65d729a2787031acd15d13adad8ef28aa onak-0.3.2.tar.gz 173462
-SHA256 c80c64b188b6db1c486035cfffa7f56acfd57b7deaf19c8873645fa8aa51a5fa onak-0.3.2.tar.gz 173462
diff --git a/app-crypt/onak/files/digest-onak-0.3.3 b/app-crypt/onak/files/digest-onak-0.3.3-r1
index 499f326aa442..499f326aa442 100644
--- a/app-crypt/onak/files/digest-onak-0.3.3
+++ b/app-crypt/onak/files/digest-onak-0.3.3-r1
diff --git a/app-crypt/onak/onak-0.3.2.ebuild b/app-crypt/onak/onak-0.3.2.ebuild
deleted file mode 100644
index 790db7143665..000000000000
--- a/app-crypt/onak/onak-0.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/onak-0.3.2.ebuild,v 1.1 2005/09/19 08:37:34 robbat2 Exp $
-
-DESCRIPTION="onak is an OpenPGP keyserver"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND="=sys-libs/db-4*"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	keepdir /var/lib/onak
-	dosbin onak maxpath sixdegrees onak-mail.pl
-	dobin splitkeys stripkey
-	doman *.[1-8]
-	insinto /etc
-	doins onak.conf
-
-	# these are CGI stuff that I don't want to deal with yet
-	#dobin lookup add gpgwww
-	sed -i \
-	-e 's,^www_port 11371,www_port 0,g' \
-	-e 's,^db_dir /var/lib/lib/onak,db_dir /var/lib/onak,g' \
-	-e 's,^logfile /var/lib/log/onak.log,logfile /var/log/onak.log,g' \
-	-e 's,^max_last 1,max_last 0,g' \
-	${D}/etc/onak.conf
-}
diff --git a/app-crypt/onak/onak-0.3.3-r1.ebuild b/app-crypt/onak/onak-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..86d4c57bfc92
--- /dev/null
+++ b/app-crypt/onak/onak-0.3.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/onak-0.3.3-r1.ebuild,v 1.1 2007/05/23 14:19:53 alonbl Exp $
+
+DESCRIPTION="onak is an OpenPGP keyserver"
+HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
+SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="berkdb postgres"
+RDEPEND="berkdb? ( =sys-libs/db-4* )
+	postgres? ( dev-db/postgresql )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	local backend="fs"
+	use berkdb && backend="db4"
+	use postgres && backend="pg"
+	if use berkdb && use postgres; then
+		ewarn "berkdb and postgres requested, postgres was preferred"
+	fi
+	econf \
+		--enable-backend="${backend}" \
+		|| die "could not configure"
+	emake || die "emake failed"
+}
+
+src_install() {
+	keepdir /var/lib/onak
+	dosbin onak maxpath sixdegrees onak-mail.pl
+	dobin splitkeys stripkey
+	doman *.[1-8]
+	insinto /etc
+	doins onak.conf
+	dodir /var/lib/onak/doc
+	insinto /var/lib/onak/doc
+	doins apache2 README LICENSE onak.sql
+	dodir /usr/lib/cgi-bin/pks
+	insinto /usr/lib/cgi-bin/pks
+	doins add gpgwww lookup
+
+	sed -i \
+		-e 's,^www_port 11371,www_port 0,g' \
+		-e 's,^db_dir /var/lib/lib/onak,db_dir /var/lib/onak,g' \
+		-e 's,^logfile /var/lib/log/onak.log,logfile /var/log/onak.log,g' \
+		-e 's,^max_last 1,max_last 0,g' \
+		${D}/etc/onak.conf
+}
diff --git a/app-crypt/onak/onak-0.3.3.ebuild b/app-crypt/onak/onak-0.3.3.ebuild
deleted file mode 100644
index f02600240353..000000000000
--- a/app-crypt/onak/onak-0.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/onak-0.3.3.ebuild,v 1.1 2007/05/22 15:43:29 alonbl Exp $
-
-DESCRIPTION="onak is an OpenPGP keyserver"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND="=sys-libs/db-4*"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	keepdir /var/lib/onak
-	dosbin onak maxpath sixdegrees onak-mail.pl
-	dobin splitkeys stripkey
-	doman *.[1-8]
-	insinto /etc
-	doins onak.conf
-
-	# these are CGI stuff that I don't want to deal with yet
-	#dobin lookup add gpgwww
-	sed -i \
-	-e 's,^www_port 11371,www_port 0,g' \
-	-e 's,^db_dir /var/lib/lib/onak,db_dir /var/lib/onak,g' \
-	-e 's,^logfile /var/lib/log/onak.log,logfile /var/log/onak.log,g' \
-	-e 's,^max_last 1,max_last 0,g' \
-	${D}/etc/onak.conf
-}