version bump

Package-Manager: portage-2.1_pre4-r1

5 files changed, 277 insertions, 2 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 ca6972f817f2..070905e9611c 100644
--- a/net-mail/freepops/Manifest
+++ b/net-mail/freepops/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 0213e8fe006f069268f3ac8d2a4917d0 ChangeLog 3123
 RMD160 307a9836986664e030631a6664a4bea4d9d03b43 ChangeLog 3123
 SHA256 87c7c35ddbd93d5e902e3434e840beb962234b7abc8dcc076188e695912c25ae ChangeLog 3123
@@ -46,3 +49,10 @@ SHA256 eb5083689b43e7b30d4e91f7bd2f5f92c1a62cf9b936e9e63a9feea818551a3a freepops
 MD5 c5cea2c71a3038980c2975d684e9e1fb metadata.xml 288
 RMD160 9156c20410e399eefadae2d44edaa536f0a93c0f metadata.xml 288
 SHA256 313310f7c1c73fdab56202d7087ea4275c706996f4f9049cc1bdd7ddbabba9db metadata.xml 288
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFD6nQgmdTrptrqvGERAs05AJoC6xcfbF6XnJPJ7QTOeFdzsmgQXwCeMpHx
+9Dep0dj4W54YupLWpTBVzAY=
+=oq1V
+-----END PGP SIGNATURE-----
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
+}