From e8298fc173a9a40a8714c626d8946a654e3991cd Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 27 Jan 2007 04:36:54 +0000 Subject: [PATCH] clean up as per bug #163912 - added dep on freepops-0.0.99-r1.ebuild} | 25 +- net-mail/freepops/freepops-0.0.99.ebuild | 6 +- 6 files changed, 254 insertions(+), 30 deletions(-) delete mode 100644 net-mail/freepops/files/digest-freepops-0.0.98-r1 create mode 100644 net-mail/freepops/files/digest-freepops-0.0.99-r1 create mode 100644 net-mail/freepops/files/freepops-0.0.99-system-lua.patch rename net-mail/freepops/{freepops-0.0.98-r1.ebuild => freepops-0.0.99-r1.ebuild} (65%) 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 + +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 + #include + +-#include "lua.h" +-#include "lauxlib.h" ++#include ++#include + #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 + ******************************************************************************/ + +-#include "lua.h" ++#include + #include "luabind.h" +-#include "lauxlib.h" ++#include + #include "compat-5.1.h" + + #include +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 + +-#include "lauxlib.h" +-#include "lualib.h" ++#include ++#include + + + /* +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 + #include + +-#include "lua.h" ++#include + #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 + #include + +-#include "lua.h" +-#include "lauxlib.h" ++#include ++#include + #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 + #include + +-#include "lua.h" +-#include "lauxlib.h" ++#include ++#include + #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 + +-#include "lua.h" +-#include "lauxlib.h" ++#include ++#include + + #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 + #include + +-#include "lua.h" +-#include "lauxlib.h" ++#include ++#include + #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 ++#include ++#include + #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 + + /** + * \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 + #include "luay.h" +-#include "luabox.h" +-#include "lauxlib.h" ++#include ++#include + #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 + ******************************************************************************/ + +-#include "lua.h" +-#include "lualib.h" +-#include "lauxlib.h" ++#include ++#include ++#include + #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 -# )" +