From: Daniel Black <dragonheart@gentoo.org>
Date: Sat, 27 Jan 2007 04:36:54 +0000 (+0000)
Subject: clean up as per bug #163912 - added dep on <lua-5.1 due to incompatibilies thanks... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8298fc173a9a40a8714c626d8946a654e3991cd;p=gentoo.git

clean up as per bug #163912 - added dep on <lua-5.1 due to incompatibilies thanks Oliver. added upstream patches as per bug #152199 thanks Luca Scarsini
Package-Manager: portage-2.1.2-r2
---

diff --git a/net-mail/freepops/ChangeLog b/net-mail/freepops/ChangeLog
index d8e1791f0a66..e1bde650ee81 100644
--- a/net-mail/freepops/ChangeLog
+++ b/net-mail/freepops/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/freepops
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.26 2006/07/11 12:03:58 dragonheart Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.27 2007/01/27 04:36:54 dragonheart Exp $
+
+*freepops-0.0.99-r1 (27 Jan 2007)
+
+  27 Jan 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/freepops-0.0.99-system-lua.patch, -freepops-0.0.98-r1.ebuild,
+  freepops-0.0.99.ebuild, +freepops-0.0.99-r1.ebuild:
+  clean up as per bug #163912 - added dep on <lua-5.1 due to incompatibilies
+  thanks Oliver. added upstream patches as per bug #152199 thanks Luca
+  Scarsini
 
 *freepops-0.0.99 (11 Jul 2006)
 
diff --git a/net-mail/freepops/files/digest-freepops-0.0.98-r1 b/net-mail/freepops/files/digest-freepops-0.0.98-r1
deleted file mode 100644
index 5c10cf62b5e8..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.0.98-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 27369ab9a39ef7857cdbe37a3314bc88 freepops-0.0.98-r1-luaupdates.tar.gz 78903
-RMD160 62c998698ba33143c69a1f60d40dc884fc82b7a1 freepops-0.0.98-r1-luaupdates.tar.gz 78903
-SHA256 50d36ea4505b015b9886b8e6a85bc70ec65967553253a9ca3a46884e634117bf freepops-0.0.98-r1-luaupdates.tar.gz 78903
-MD5 4887be935042e49db65b6494103a3867 freepops-0.0.98.tar.gz 2091185
-RMD160 52f65e231214f2081a759206a3a8c8ca311b36fb freepops-0.0.98.tar.gz 2091185
-SHA256 6c65fd153866fdcf74430f4d512dd659e7240df8e7bdb618e5d697c36f5d7f8f freepops-0.0.98.tar.gz 2091185
diff --git a/net-mail/freepops/files/digest-freepops-0.0.99-r1 b/net-mail/freepops/files/digest-freepops-0.0.99-r1
new file mode 100644
index 000000000000..7d4df6f1566f
--- /dev/null
+++ b/net-mail/freepops/files/digest-freepops-0.0.99-r1
@@ -0,0 +1,6 @@
+MD5 8840fb6b3d4d0916bcddde926d068e4e freepops-0.0.99.tar.gz 2092051
+RMD160 6288029b6fef1e3d635ec64e14c6b0e8b08100e8 freepops-0.0.99.tar.gz 2092051
+SHA256 a4a10ffe46b5cf98ac43521ad16e06540ac007eccebc8c3974e224f14c52eb04 freepops-0.0.99.tar.gz 2092051
+MD5 0db10447aecacd5535c8094e83187fb6 freepops-0.0.99_updates_20070127.patch.bz2 16713
+RMD160 e96aa52619e8bb73e0e611456890d9dfd6cb9aca freepops-0.0.99_updates_20070127.patch.bz2 16713
+SHA256 5bd1be6b4764f33cd0778a7c787486f113e25e41cc233581aac99314d2b82dd9 freepops-0.0.99_updates_20070127.patch.bz2 16713
diff --git a/net-mail/freepops/files/freepops-0.0.99-system-lua.patch b/net-mail/freepops/files/freepops-0.0.99-system-lua.patch
new file mode 100644
index 000000000000..d53f26492cb5
--- /dev/null
+++ b/net-mail/freepops/files/freepops-0.0.99-system-lua.patch
@@ -0,0 +1,228 @@
+diff -ru freepops-0.0.99.orig/modules/modules freepops-0.0.99/modules/modules
+--- freepops-0.0.99.orig/modules/modules	2006-01-13 10:47:33.000000000 +1100
++++ freepops-0.0.99/modules/modules	2007-01-27 13:51:53.000000000 +1100
+@@ -1,4 +1,4 @@
+-MODULES-Common= lua		\
++MODULES-Common= 		\
+ 		luacompat	\
+ 		luay		\
+ 		luabind 	\
+diff -ru freepops-0.0.99.orig/modules/src/base64_lua/base64_lua.c freepops-0.0.99/modules/src/base64_lua/base64_lua.c
+--- freepops-0.0.99.orig/modules/src/base64_lua/base64_lua.c	2006-01-14 08:46:54.000000000 +1100
++++ freepops-0.0.99/modules/src/base64_lua/base64_lua.c	2007-01-27 13:51:53.000000000 +1100
+@@ -15,8 +15,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
+-#include "lauxlib.h"
++#include <lua.h>
++#include <lauxlib.h>
+ #include "base64.h"
+ #include "compat-5.1.h"
+ 
+diff -ru freepops-0.0.99.orig/modules/src/crypto_lua/crypto_lua.c freepops-0.0.99/modules/src/crypto_lua/crypto_lua.c
+--- freepops-0.0.99.orig/modules/src/crypto_lua/crypto_lua.c	2006-01-14 08:46:54.000000000 +1100
++++ freepops-0.0.99/modules/src/crypto_lua/crypto_lua.c	2007-01-27 13:51:53.000000000 +1100
+@@ -13,9 +13,9 @@
+  * 	Name <gareuselesinge@users.sourceforge.net>
+  ******************************************************************************/
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "luabind.h"
+-#include "lauxlib.h"
++#include <lauxlib.h>
+ #include "compat-5.1.h"
+ 
+ #include <stdlib.h>
+diff -ru freepops-0.0.99.orig/modules/src/luafull/Makefile freepops-0.0.99/modules/src/luafull/Makefile
+--- freepops-0.0.99.orig/modules/src/luafull/Makefile	2005-06-09 00:57:12.000000000 +1000
++++ freepops-0.0.99/modules/src/luafull/Makefile	2007-01-27 13:51:53.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.99.orig/modules/src/luafull/lua.c freepops-0.0.99/modules/src/luafull/lua.c
+--- freepops-0.0.99.orig/modules/src/luafull/lua.c	2004-11-17 02:25:38.000000000 +1100
++++ freepops-0.0.99/modules/src/luafull/lua.c	2007-01-27 13:51:53.000000000 +1100
+@@ -12,10 +12,10 @@
+ 
+ #define lua_c
+ 
+-#include "lua.h"
++#include <lua.h>
+ 
+-#include "lauxlib.h"
+-#include "lualib.h"
++#include <lauxlib.h>
++#include <lualib.h>
+ 
+ 
+ /*
+diff -ru freepops-0.0.99.orig/modules/src/luay/luay.c freepops-0.0.99/modules/src/luay/luay.c
+--- freepops-0.0.99.orig/modules/src/luay/luay.c	2005-06-30 02:26:22.000000000 +1000
++++ freepops-0.0.99/modules/src/luay/luay.c	2007-01-27 13:51:53.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.99.orig/modules/src/mlex_lua/mlex_lua.c freepops-0.0.99/modules/src/mlex_lua/mlex_lua.c
+--- freepops-0.0.99.orig/modules/src/mlex_lua/mlex_lua.c	2006-01-13 22:52:38.000000000 +1100
++++ freepops-0.0.99/modules/src/mlex_lua/mlex_lua.c	2007-01-27 13:51:53.000000000 +1100
+@@ -1,8 +1,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
+-#include "lauxlib.h"
++#include <lua.h>
++#include <lauxlib.h>
+ #include "mlex.h"
+ #include "list.h"
+ 
+--- freepops-0.0.99.orig/modules/src/portablesocket_lua/psock_lua.c	2006-01-14 08:46:54.000000000 +1100
++++ freepops-0.0.99/modules/src/portablesocket_lua/psock_lua.c	2007-01-27 13:51:53.000000000 +1100
+@@ -16,8 +16,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
+-#include "lauxlib.h"
++#include <lua.h>
++#include <lauxlib.h>
+ #include "socketcommon.h"
+ #include "luabind.h"
+ 
+diff -ru freepops-0.0.99.orig/modules/src/regularexp_lua/regularexp_lua.c freepops-0.0.99/modules/src/regularexp_lua/regularexp_lua.c
+--- freepops-0.0.99.orig/modules/src/regularexp_lua/regularexp_lua.c	2006-01-14 08:46:55.000000000 +1100
++++ freepops-0.0.99/modules/src/regularexp_lua/regularexp_lua.c	2007-01-27 13:51:53.000000000 +1100
+@@ -20,8 +20,8 @@
+ #endif
+ #include <regex.h>
+ 
+-#include "lua.h"
+-#include "lauxlib.h"
++#include <lua.h>
++#include <lauxlib.h>
+ 
+ #include "luabind.h"
+ 
+diff -ru freepops-0.0.99.orig/modules/src/stringhack_lua/stringhack_lua.c freepops-0.0.99/modules/src/stringhack_lua/stringhack_lua.c
+--- freepops-0.0.99.orig/modules/src/stringhack_lua/stringhack_lua.c	2006-01-14 08:46:55.000000000 +1100
++++ freepops-0.0.99/modules/src/stringhack_lua/stringhack_lua.c	2007-01-27 13:51:53.000000000 +1100
+@@ -15,8 +15,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "lua.h"
+-#include "lauxlib.h"
++#include <lua.h>
++#include <lauxlib.h>
+ #include "lstringhack.h"
+ 
+ #include "compat-5.1.h"
+diff -ru freepops-0.0.99.orig/src/Makefile freepops-0.0.99/src/Makefile
+--- freepops-0.0.99.orig/src/Makefile	2006-04-09 23:52:57.000000000 +1000
++++ freepops-0.0.99/src/Makefile	2007-01-27 13:51:53.000000000 +1100
+@@ -47,8 +47,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
+@@ -99,9 +99,7 @@
+ 		luaexpat	\
+ 		luafilesystem	\
+                 luay            \
+-		luacompat-5.1	\
+-                lua             \
+-                lualib          
++		luacompat-5.1
+ 		
+ EXCLUDELIBS=	serialize_lua \
+ 		browser_lua \
+@@ -109,7 +107,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.99.orig/src/engine.c freepops-0.0.99/src/engine.c
+--- freepops-0.0.99.orig/src/engine.c	2006-01-16 06:43:15.000000000 +1100
++++ freepops-0.0.99/src/engine.c	2007-01-27 13:51:53.000000000 +1100
+@@ -24,9 +24,9 @@
+ #include "popserver.h"
+ #include "popstate.h"
+ 
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <lua.h>
++#include <lualib.h>
++#include <lauxlib.h>
+ #include "luay.h"
+ 
+ #include "luabox.h"
+diff -ru freepops-0.0.99.orig/src/engine.h freepops-0.0.99/src/engine.h
+--- freepops-0.0.99.orig/src/engine.h	2005-06-30 02:26:27.000000000 +1000
++++ freepops-0.0.99/src/engine.h	2007-01-27 13:51:53.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.99.orig/src/freepops.c freepops-0.0.99/src/freepops.c
+--- freepops-0.0.99.orig/src/freepops.c	2006-01-16 06:43:15.000000000 +1100
++++ freepops-0.0.99/src/freepops.c	2007-01-27 13:51:53.000000000 +1100
+@@ -61,10 +61,10 @@
+ #include "altsocklib.h"
+ #include "regularexp.h"
+ 
+-#include "lua.h"
++#include <lua.h>
+ #include "luay.h"
+-#include "luabox.h"
+-#include "lauxlib.h"
++#include <luabox.h>
++#include <lauxlib.h>
+ #include "luay.h"
+ 
+ #include "log.h"
+diff -ru freepops-0.0.99.orig/src/luabox.c freepops-0.0.99/src/luabox.c
+--- freepops-0.0.99.orig/src/luabox.c	2005-06-11 10:28:11.000000000 +1000
++++ freepops-0.0.99/src/luabox.c	2007-01-27 13:52:33.000000000 +1100
+@@ -13,9 +13,9 @@
+  * 	Enrico Tassi <gareuselesinge@users.sourceforge.net>
+  ******************************************************************************/
+ 
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <lua.h>
++#include <lualib.h>
++#include <lauxlib.h>
+ #include "luay.h"
+ 
+ #include "luabox.h"
diff --git a/net-mail/freepops/freepops-0.0.98-r1.ebuild b/net-mail/freepops/freepops-0.0.99-r1.ebuild
similarity index 65%
rename from net-mail/freepops/freepops-0.0.98-r1.ebuild
rename to net-mail/freepops/freepops-0.0.99-r1.ebuild
index 419dd8b815e4..b4645758ec93 100644
--- a/net-mail/freepops/freepops-0.0.98-r1.ebuild
+++ b/net-mail/freepops/freepops-0.0.99-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.98-r1.ebuild,v 1.2 2006/06/05 08:31:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.99-r1.ebuild,v 1.1 2007/01/27 04:36:54 dragonheart Exp $
 
 inherit eutils
 
 DESCRIPTION="WebMail->POP3 converter and more"
 HOMEPAGE="http://freepops.sourceforge.net/"
 SRC_URI="mirror://sourceforge/freepops/${P}.tar.gz
-		mirror://gentoo/${PF}-luaupdates.tar.gz"
+	mirror://gentoo/${P}_updates_20070127.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,18 +17,13 @@ IUSE="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
-#	)"
+		<dev-lang/lua-5.1"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.0.97-system-lua.patch"
+	epatch "${WORKDIR}"/${P}_updates_20070127.patch
+	epatch "${FILESDIR}"/${P}-system-lua.patch
 }
 
 src_compile() {
@@ -40,11 +35,6 @@ src_compile() {
 	fi
 	sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
 	emake -j1 all || die "make failed"
-	# doc fails bug #133614. seems to require alteration of the freepopsd
-	# executable to fix
-	#if use doc ; then
-	#	emake -j1 doc || die "make doc failed"
-	#fi
 }
 
 src_install() {
@@ -52,9 +42,6 @@ src_install() {
 	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
diff --git a/net-mail/freepops/freepops-0.0.99.ebuild b/net-mail/freepops/freepops-0.0.99.ebuild
index ba25a6c9574d..ff7abc8270a9 100644
--- a/net-mail/freepops/freepops-0.0.99.ebuild
+++ b/net-mail/freepops/freepops-0.0.99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.99.ebuild,v 1.1 2006/07/11 12:03:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.99.ebuild,v 1.2 2007/01/27 04:36:54 dragonheart Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="gnutls"
 RDEPEND=">=net-misc/curl-7.10.8
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( dev-libs/openssl )
-		dev-lang/lua"
+		<dev-lang/lua-5.1"
 
 src_unpack() {
 	unpack ${A}