version bump

(Portage version: 2.1_pre4-r1)

5 files changed, 302 insertions, 12 deletions

diff --git a/net-mail/freepops/ChangeLog b/net-mail/freepops/ChangeLog
index 2ed8929aa6d4..7e30fae3e1e4 100644
--- a/net-mail/freepops/ChangeLog
+++ b/net-mail/freepops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/freepops
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.18 2005/12/02 23:54:10 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.19 2006/02/08 21:55:14 dragonheart Exp $
+
+*freepops-0.0.97 (08 Feb 2006)
+
+  08 Feb 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/freepops-0.0.97-system-lua.patch, +freepops-0.0.97.ebuild:
+  version bump
 
 *freepops-0.0.96 (02 Dec 2005)
 
diff --git a/net-mail/freepops/Manifest b/net-mail/freepops/Manifest
index 90d47609d3d6..5456266dea76 100644
--- a/net-mail/freepops/Manifest
+++ b/net-mail/freepops/Manifest
@@ -1,23 +1,48 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 063ec98e99d4ecacc40c93534a2bbbb4 ChangeLog 2949
+RMD160 a09de4965a9934b237060e5317c9a86a1c28acfd ChangeLog 2949
+SHA256 3fe5ae61c77cd62af3c863647d440b3bb336d7674af235d64d39ba0c67f6a1fe ChangeLog 2949
 MD5 d7ca204372719b1d3fa4aca59cf9a442 files/digest-freepops-0.0.27-r1 68
+RMD160 faf0b1d0d4d02d87aabdf480e6d5e351a652e05b files/digest-freepops-0.0.27-r1 68
+SHA256 0f827b940fa23aa19283d3c5abab2a885ae8f5de155cae082a4fcff530efd6e0 files/digest-freepops-0.0.27-r1 68
 MD5 787d8c0e312170927dde02eadb05f199 files/digest-freepops-0.0.31 68
+RMD160 c9dfb79b7d5ffddc2249713168b508ff28b6457c files/digest-freepops-0.0.31 68
+SHA256 599d0d34b98210ef208d66468404f082d4cb66218acb5b110fe9db9e076b2f30 files/digest-freepops-0.0.31 68
 MD5 cc59d60c97a67dab4adc6379cd88c6cc files/digest-freepops-0.0.95 68
+RMD160 8a378a61989fc56fd1c48ada225fa70f0d7e7126 files/digest-freepops-0.0.95 68
+SHA256 79728ebd4c72b88205895fab8857391084050393a5f3fb217a5e1fbe20b9f251 files/digest-freepops-0.0.95 68
 MD5 21ee5999234bdb82080dda6b28f0e2d1 files/digest-freepops-0.0.96 68
+RMD160 ab9480fb4890dc038e15c3b842f754f512c24d33 files/digest-freepops-0.0.96 68
+SHA256 bb338deed6e6da09817c9c9cb88edb121685df4d12ac1eb5f70f844edbb4f49c files/digest-freepops-0.0.96 68
+MD5 8711bb3f89904131b5a9acef59e4c3ee files/digest-freepops-0.0.97 250
+RMD160 e3fe7f1a33cf13d5a0baea9a1e1d68f7829e0fd7 files/digest-freepops-0.0.97 250
+SHA256 ba49a95060d00388af06fc91b2a3b07ec1e8bd6491ab2702f62bcf97902b3c61 files/digest-freepops-0.0.97 250
 MD5 87de47c4792aa1687b9d521a4e4c313a files/freepops-0.0.27-initd.patch 634
+RMD160 b711ccad88acb5043b8c2fcb114ac2016b8c9492 files/freepops-0.0.27-initd.patch 634
+SHA256 afddccc99281e911bb44aad84873d9be50af8fdb20376e654dbe4777acdcd2cb files/freepops-0.0.27-initd.patch 634
 MD5 21057de46bc1ad28a002f98771043d47 files/freepops-0.0.31-srcmake.patch 466
+RMD160 a4816afa18a1bc79ac8a9e92da7939e99b9f35b2 files/freepops-0.0.31-srcmake.patch 466
+SHA256 3060aa25d84ac2618acf2317bfc4a2ac0077fca9e0bbbe67e64d16beb9a3b250 files/freepops-0.0.31-srcmake.patch 466
 MD5 21057de46bc1ad28a002f98771043d47 files/freepops-0.0.95-srcmake.patch 466
+RMD160 a4816afa18a1bc79ac8a9e92da7939e99b9f35b2 files/freepops-0.0.95-srcmake.patch 466
+SHA256 3060aa25d84ac2618acf2317bfc4a2ac0077fca9e0bbbe67e64d16beb9a3b250 files/freepops-0.0.95-srcmake.patch 466
+MD5 937f449869f442fb48666c7089c39a8d files/freepops-0.0.97-system-lua.patch 7623
+RMD160 dc539e432fec202b54c44b4090e27a43279ae922 files/freepops-0.0.97-system-lua.patch 7623
+SHA256 8dfccb48bbd75e0aeb043ab13f8d06c41ec9ffb2b1010f43171eb82b9d742476 files/freepops-0.0.97-system-lua.patch 7623
 MD5 6f0c9ab8babd9f09d69f1d197fc1f0cc freepops-0.0.27-r1.ebuild 1193
+RMD160 e8dfc92c0f8429a0dc5bf046cd9938d785ad8d4d freepops-0.0.27-r1.ebuild 1193
+SHA256 57629a12eff6faa6f31ebbdce57313b7c5a7792d808eb69e71305ed58e784754 freepops-0.0.27-r1.ebuild 1193
 MD5 98c599d235e47a75f8ddee78c4ec2b83 freepops-0.0.31.ebuild 1190
+RMD160 5216a4ef75265a41615b86b637db6e79a4f51b9d freepops-0.0.31.ebuild 1190
+SHA256 a6c50a0b09cd024f4eda0ff78600b6d77fe587c32ff743dd532c1d734c35bf88 freepops-0.0.31.ebuild 1190
 MD5 1a8363d9df6cb6f3dd72da2d5b31ffbf freepops-0.0.95.ebuild 1192
+RMD160 e55e32656beffdaa51f05f8b875ebcd978c4a66d freepops-0.0.95.ebuild 1192
+SHA256 c0cf18edb855c658cc51a57683ff8ae4ed58bb0cc6ccc5db78f883bd4f5dec69 freepops-0.0.95.ebuild 1192
 MD5 0a2bda7247ec44c0df51233f3a1c3edd freepops-0.0.96.ebuild 1193
+RMD160 b609c5275aab678239ad9edbc75ade5b4603b7bd freepops-0.0.96.ebuild 1193
+SHA256 2284c3c1fe3e51f7672e6ea4277a895bdf09293cdd57f18cbc5935a2221a03ca freepops-0.0.96.ebuild 1193
+MD5 383c6d19792cf27763062497e655d267 freepops-0.0.97.ebuild 1441
+RMD160 a84e796dbf1968ace5fc3e75ee9edc34d415a824 freepops-0.0.97.ebuild 1441
+SHA256 5dd72eb983542dd96d0ef224c9030fe72c9aedb5d8e1ac66ffa7b83047b899c6 freepops-0.0.97.ebuild 1441
 MD5 c5cea2c71a3038980c2975d684e9e1fb metadata.xml 288
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDkN89gIKl8Uu19MoRAhMYAJ9WOamgtxTGyFLWzV2N06SBzSHEfACfR2OR
-7Xp9t0Hzzqvf747WZQ78fRI=
-=Z2AW
------END PGP SIGNATURE-----
+RMD160 9156c20410e399eefadae2d44edaa536f0a93c0f metadata.xml 288
+SHA256 313310f7c1c73fdab56202d7087ea4275c706996f4f9049cc1bdd7ddbabba9db metadata.xml 288
diff --git a/net-mail/freepops/files/digest-freepops-0.0.97 b/net-mail/freepops/files/digest-freepops-0.0.97
new file mode 100644
index 000000000000..f25628e1f261
--- /dev/null
+++ b/net-mail/freepops/files/digest-freepops-0.0.97
@@ -0,0 +1,3 @@
+MD5 e84883baa620bfa1394a354c900787f1 freepops-0.0.97.tar.gz 2090483
+RMD160 b1b051a6d0d18da0a83942522e88ed1df0360476 freepops-0.0.97.tar.gz 2090483
+SHA256 0bfe920004f85d12ebeeee25ae5e930a7edf2f333f40deb3043d24a9cf7beeda freepops-0.0.97.tar.gz 2090483
diff --git a/net-mail/freepops/files/freepops-0.0.97-system-lua.patch b/net-mail/freepops/files/freepops-0.0.97-system-lua.patch
new file mode 100644
index 000000000000..0a450ace4447
--- /dev/null
+++ b/net-mail/freepops/files/freepops-0.0.97-system-lua.patch
@@ -0,0 +1,199 @@
+Only in freepops-0.0.97.nosystemlua/: config
+diff -ru freepops-0.0.97/modules/modules freepops-0.0.97.nosystemlua/modules/modules
+--- freepops-0.0.97/modules/modules	2006-01-13 10:47:33.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/modules	2006-02-09 00:56:24.000000000 +1100
+@@ -1,4 +1,4 @@
+-MODULES-Common= lua		\
++MODULES-Common= 		\
+ 		luacompat	\
+ 		luay		\
+ 		luabind 	\
+diff -ru freepops-0.0.97/modules/src/base64_lua/base64_lua.c freepops-0.0.97.nosystemlua/modules/src/base64_lua/base64_lua.c
+--- freepops-0.0.97/modules/src/base64_lua/base64_lua.c	2006-01-14 08:46:54.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/src/base64_lua/base64_lua.c	2006-02-09 09:11:55.000000000 +1100
+@@ -15,7 +15,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "lauxlib.h"
+ #include "base64.h"
+ #include "compat-5.1.h"
+diff -ru freepops-0.0.97/modules/src/crypto_lua/crypto_lua.c freepops-0.0.97.nosystemlua/modules/src/crypto_lua/crypto_lua.c
+--- freepops-0.0.97/modules/src/crypto_lua/crypto_lua.c	2006-01-14 08:46:54.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/src/crypto_lua/crypto_lua.c	2006-02-09 09:11:55.000000000 +1100
+@@ -13,7 +13,7 @@
+  * 	Name <gareuselesinge@users.sourceforge.net>
+  ******************************************************************************/
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "luabind.h"
+ #include "lauxlib.h"
+ #include "compat-5.1.h"
+diff -ru freepops-0.0.97/modules/src/luafull/Makefile freepops-0.0.97.nosystemlua/modules/src/luafull/Makefile
+--- freepops-0.0.97/modules/src/luafull/Makefile	2005-06-09 00:57:12.000000000 +1000
++++ freepops-0.0.97.nosystemlua/modules/src/luafull/Makefile	2006-02-09 00:56:24.000000000 +1100
+@@ -111,7 +111,6 @@
+ #		  $(RANLIB) ../../lib/liblualib-host.a )
+ 	$(H)($(RANLIB) ../../lib/liblua-host.a; \
+ 		$(RANLIB) ../../lib/liblualib-host.a; \
+-		$(RANLIB) ../../lib/liblua.a; \
+ 		$(RANLIB) ../../lib/libluaexpat.a; \
+ 		$(RANLIB) ../../lib/libgetdate.a; \
+ 	        $(RANLIB) ../../lib/libluafilesystem.a	)
+diff -ru freepops-0.0.97/modules/src/luafull/lua.c freepops-0.0.97.nosystemlua/modules/src/luafull/lua.c
+--- freepops-0.0.97/modules/src/luafull/lua.c	2004-11-17 02:25:38.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/src/luafull/lua.c	2006-02-09 09:11:55.000000000 +1100
+@@ -12,7 +12,7 @@
+ 
+ #define lua_c
+ 
+-#include "lua.h"
++#include <lua.h>
+ 
+ #include "lauxlib.h"
+ #include "lualib.h"
+diff -ru freepops-0.0.97/modules/src/luay/luay.c freepops-0.0.97.nosystemlua/modules/src/luay/luay.c
+--- freepops-0.0.97/modules/src/luay/luay.c	2005-06-30 02:26:22.000000000 +1000
++++ freepops-0.0.97.nosystemlua/modules/src/luay/luay.c	2006-02-09 09:11:55.000000000 +1100
+@@ -16,7 +16,7 @@
+ #include <math.h>
+ #include <string.h>
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "luay.h"
+ 
+ #define LINE_PREFIX "LUAY: "
+diff -ru freepops-0.0.97/modules/src/mlex_lua/mlex_lua.c freepops-0.0.97.nosystemlua/modules/src/mlex_lua/mlex_lua.c
+--- freepops-0.0.97/modules/src/mlex_lua/mlex_lua.c	2006-01-13 22:52:38.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/src/mlex_lua/mlex_lua.c	2006-02-09 09:11:55.000000000 +1100
+@@ -1,7 +1,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "lauxlib.h"
+ #include "mlex.h"
+ #include "list.h"
+diff -ru freepops-0.0.97/modules/src/portablesocket_lua/psock_lua.c freepops-0.0.97.nosystemlua/modules/src/portablesocket_lua/psock_lua.c
+--- freepops-0.0.97/modules/src/portablesocket_lua/psock_lua.c	2006-01-14 08:46:54.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/src/portablesocket_lua/psock_lua.c	2006-02-09 09:11:55.000000000 +1100
+@@ -16,7 +16,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "lauxlib.h"
+ #include "socketcommon.h"
+ #include "luabind.h"
+diff -ru freepops-0.0.97/modules/src/regularexp_lua/regularexp_lua.c freepops-0.0.97.nosystemlua/modules/src/regularexp_lua/regularexp_lua.c
+--- freepops-0.0.97/modules/src/regularexp_lua/regularexp_lua.c	2006-01-14 08:46:55.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/src/regularexp_lua/regularexp_lua.c	2006-02-09 09:11:55.000000000 +1100
+@@ -20,7 +20,7 @@
+ #endif
+ #include <regex.h>
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "lauxlib.h"
+ 
+ #include "luabind.h"
+diff -ru freepops-0.0.97/modules/src/stringhack_lua/stringhack_lua.c freepops-0.0.97.nosystemlua/modules/src/stringhack_lua/stringhack_lua.c
+--- freepops-0.0.97/modules/src/stringhack_lua/stringhack_lua.c	2006-01-14 08:46:55.000000000 +1100
++++ freepops-0.0.97.nosystemlua/modules/src/stringhack_lua/stringhack_lua.c	2006-02-09 09:11:55.000000000 +1100
+@@ -15,7 +15,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "lauxlib.h"
+ #include "lstringhack.h"
+ 
+diff -ru freepops-0.0.97/src/Makefile freepops-0.0.97.nosystemlua/src/Makefile
+--- freepops-0.0.97/src/Makefile	2006-01-13 10:36:39.000000000 +1100
++++ freepops-0.0.97.nosystemlua/src/Makefile	2006-02-09 09:19:14.000000000 +1100
+@@ -41,8 +41,8 @@
+ #	CFLAGS+= -DFREEPOPSLUA_PATH_UNOFFICIAL=\"$HOME/config/settings/freepops/lua_unofficial/\"
+ #
+ #else
+-	CFLAGS+= -DFREEPOPSLUA_PATH=\"$(PREFIX)share/freepops/lua/\"
+-	CFLAGS+= -DFREEPOPSLUA_PATH_UNOFFICIAL=\"$(PREFIX)share/freepops/lua_unofficial/\"
++	CFLAGS+= -DFREEPOPSLUA_PATH=\"/usr/share/freepops/lua/\"
++	CFLAGS+= -DFREEPOPSLUA_PATH_UNOFFICIAL=\"/usr/share/freepops/lua_unofficial/\"
+ #endif
+ endif
+ endif
+@@ -92,9 +92,7 @@
+ 		luaexpat	\
+ 		luafilesystem	\
+                 luay            \
+-		luacompat-5.1	\
+-                lua             \
+-                lualib          
++		luacompat-5.1
+ 		
+ EXCLUDELIBS=	serialize_lua \
+ 		browser_lua \
+@@ -102,7 +100,7 @@
+ 		
+ LIBSTOLINK=$(filter-out $(EXCLUDELIBS),$(LIBS))
+ 
+-LDFLAGS=$(FORCE_LINK)
++LDFLAGS=$(FORCE_LINK) -llua -llualib
+ 		
+ ifeq "$(OS)" "Windows"
+   ifeq "$(SSL)" "openssl"
+diff -ru freepops-0.0.97/src/engine.c freepops-0.0.97.nosystemlua/src/engine.c
+--- freepops-0.0.97/src/engine.c	2006-01-16 06:43:15.000000000 +1100
++++ freepops-0.0.97.nosystemlua/src/engine.c	2006-02-09 09:11:55.000000000 +1100
+@@ -24,7 +24,7 @@
+ #include "popserver.h"
+ #include "popstate.h"
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "lualib.h"
+ #include "lauxlib.h"
+ #include "luay.h"
+diff -ru freepops-0.0.97/src/engine.h freepops-0.0.97.nosystemlua/src/engine.h
+--- freepops-0.0.97/src/engine.h	2005-06-30 02:26:27.000000000 +1000
++++ freepops-0.0.97.nosystemlua/src/engine.h	2006-02-09 09:11:55.000000000 +1100
+@@ -19,7 +19,7 @@
+ 
+ #include "popserver.h"
+ #include "popstate.h"
+-#include "lua.h"
++#include <lua.h>
+ 
+ /**
+  * \brief this struct is the implementation of webmail access
+diff -ru freepops-0.0.97/src/freepops.c freepops-0.0.97.nosystemlua/src/freepops.c
+--- freepops-0.0.97/src/freepops.c	2006-01-16 06:43:15.000000000 +1100
++++ freepops-0.0.97.nosystemlua/src/freepops.c	2006-02-09 09:11:55.000000000 +1100
+@@ -61,7 +61,7 @@
+ #include "altsocklib.h"
+ #include "regularexp.h"
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "luay.h"
+ #include "luabox.h"
+ #include "lauxlib.h"
+diff -ru freepops-0.0.97/src/luabox.c freepops-0.0.97.nosystemlua/src/luabox.c
+--- freepops-0.0.97/src/luabox.c	2005-06-11 10:28:11.000000000 +1000
++++ freepops-0.0.97.nosystemlua/src/luabox.c	2006-02-09 09:11:55.000000000 +1100
+@@ -13,7 +13,7 @@
+  * 	Enrico Tassi <gareuselesinge@users.sourceforge.net>
+  ******************************************************************************/
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "lualib.h"
+ #include "lauxlib.h"
+ #include "luay.h"
diff --git a/net-mail/freepops/freepops-0.0.97.ebuild b/net-mail/freepops/freepops-0.0.97.ebuild
new file mode 100644
index 000000000000..4120ae8835bb
--- /dev/null
+++ b/net-mail/freepops/freepops-0.0.97.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.97.ebuild,v 1.1 2006/02/08 21:55:14 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="WebMail->POP3 converter and more"
+HOMEPAGE="http://freepops.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freepops/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gnutls"
+
+RDEPEND=">=net-misc/curl-7.10.8
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+		dev-lang/lua"
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-doc/doxygen-1.3
+		app-text/tetex
+		virtual/ghostscript
+	)"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-system-lua.patch"
+}
+
+src_compile() {
+	# note fbsd and Darwin and osx targets exist here too
+	if use gnutls; then
+		./configure.sh linux-gnutls || die "configure gnutls failed"
+	else
+		./configure.sh linux || die "configure openssl failed"
+	fi
+	sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
+	emake -j1 all || die "make failed"
+	if use doc ; then
+		emake -j1 doc || die "make doc failed"
+	fi
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS README ChangeLog TODO \
+		"${D}"/usr/share/doc/${PN}/*
+	rm -rf "${D}"/usr/share/doc/${PN}
+	if use doc; then
+		mv doc/manual/html-manual "${D}/usr/share/doc/${PF}"
+	fi
+
+	newinitd buildfactory/freePOPsd.initd freepopsd
+	newconfd buildfactory/freePOPsd.confd freepopsd
+}