version bump + a little tree cleaning

Package-Manager: portage-2.1.2.2

12 files changed, 77 insertions, 200 deletions

diff --git a/net-mail/freepops/ChangeLog b/net-mail/freepops/ChangeLog
index 363ec5393f7b..420ebcd9eadd 100644
--- a/net-mail/freepops/ChangeLog
+++ b/net-mail/freepops/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/freepops
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.29 2007/05/10 21:42:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.30 2007/05/19 00:47:18 dragonheart Exp $
+
+*freepops-0.2.3 (19 May 2007)
+
+  19 May 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/freepops-0.2.3-pop3config.diff, -freepops-0.0.99.ebuild,
+  -freepops-0.0.99-r1.ebuild, -freepops-0.2.0.ebuild,
+  -freepops-0.2.2.ebuild, +freepops-0.2.3.ebuild:
+  version bump + a little tree cleaning
 
 *freepops-0.2.2-r1 (10 May 2007)
 
diff --git a/net-mail/freepops/Manifest b/net-mail/freepops/Manifest
index 5d1e11adad61..87970d210ac4 100644
--- a/net-mail/freepops/Manifest
+++ b/net-mail/freepops/Manifest
@@ -14,39 +14,29 @@ AUX freepops-0.2.2-gcrypt.patch 469 RMD160 f8f317f939c9375d6be568ac060393be67773
 MD5 ff726aa5526af35801ccc1deca8cf4bc files/freepops-0.2.2-gcrypt.patch 469
 RMD160 f8f317f939c9375d6be568ac060393be67773620 files/freepops-0.2.2-gcrypt.patch 469
 SHA256 2dbf42b3a703f8d1f86703be5b96ac91a8748be008b55939384d7ca0c872fee7 files/freepops-0.2.2-gcrypt.patch 469
+AUX freepops-0.2.3-pop3config.diff 945 RMD160 e85b7511ccc837ceb12eff87a324d660bab22b76 SHA1 bcbb313efe1947d59ec27176c64bf31eb841f37c SHA256 7004a30df5b6782398c9292dcd9f6c085e293206fe1e6fb49bfd03b6792af14c
+MD5 096c2993ae925d832ebbb0954a8cfc17 files/freepops-0.2.3-pop3config.diff 945
+RMD160 e85b7511ccc837ceb12eff87a324d660bab22b76 files/freepops-0.2.3-pop3config.diff 945
+SHA256 7004a30df5b6782398c9292dcd9f6c085e293206fe1e6fb49bfd03b6792af14c files/freepops-0.2.3-pop3config.diff 945
 DIST freepops-0.0.31.tar.gz 1848031 RMD160 6b669ebd2af536ca2b35d2dcf3291d22009ae0d2 SHA1 155f5ec76754a96ccab0fbfeda7107ce7054568e SHA256 b81a6d68415d232c3bb3ec7bb9a1b2f14d6262ace52847b87e1793b494e46b40
-DIST freepops-0.0.99.tar.gz 2092051 RMD160 6288029b6fef1e3d635ec64e14c6b0e8b08100e8 SHA1 c1eccd614efb639a8251c3c1755f4f2140317111 SHA256 a4a10ffe46b5cf98ac43521ad16e06540ac007eccebc8c3974e224f14c52eb04
-DIST freepops-0.0.99_updates_20070127.patch.bz2 16713 RMD160 e96aa52619e8bb73e0e611456890d9dfd6cb9aca SHA1 0cb8271558f6881688e4c66233c72b644765261a SHA256 5bd1be6b4764f33cd0778a7c787486f113e25e41cc233581aac99314d2b82dd9
-DIST freepops-0.2.0.tar.gz 1782970 RMD160 7291e7e8166baab92bd7480d6ba8e0f40c14a84e SHA1 0c7f0bf1053e98037597ac102d9c1b964cfcd75a SHA256 4e24595050efad0c5df40cb9286e8fea8aabfbeeca6cf7d6387f23ac8b60db5d
 DIST freepops-0.2.2.tar.gz 1796281 RMD160 ce0df112cd967f10746a5d9010d551f4bb8b66d9 SHA1 2ab1c02e4230e3fa48ae567fcf734e82975b564b SHA256 bc74f03c548f5d7f23dcc49a51b9ab384783c5378d356bf942e9eb7109f88dc0
+DIST freepops-0.2.3.tar.gz 1885970 RMD160 c1c96d65f76ab8814e3d9d0184bdc11fb11f73de SHA1 4d8f037a466ca72420431fe7d12f6846d2f09659 SHA256 1a1330de998121892c9f7a420c0b76b0b6c95899d68ffc5aa42370de36fd52d9
 EBUILD freepops-0.0.31.ebuild 1190 RMD160 5216a4ef75265a41615b86b637db6e79a4f51b9d SHA1 ba1ee986c24c7f68b0d4031ae1a0c21e73395ce1 SHA256 a6c50a0b09cd024f4eda0ff78600b6d77fe587c32ff743dd532c1d734c35bf88
 MD5 98c599d235e47a75f8ddee78c4ec2b83 freepops-0.0.31.ebuild 1190
 RMD160 5216a4ef75265a41615b86b637db6e79a4f51b9d freepops-0.0.31.ebuild 1190
 SHA256 a6c50a0b09cd024f4eda0ff78600b6d77fe587c32ff743dd532c1d734c35bf88 freepops-0.0.31.ebuild 1190
-EBUILD freepops-0.0.99-r1.ebuild 1324 RMD160 d25da0ce55ba3e03ac6bf4fe899305acfa198267 SHA1 4a4ed3a9cff062ad41419e7eaac60f0126301feb SHA256 ba4a8149a24361bcd01836d5d764ebaf51ff22d6e57c4b63e0314a5c55210fad
-MD5 cb08e917710cf010e24be2a9e6d2c9f5 freepops-0.0.99-r1.ebuild 1324
-RMD160 d25da0ce55ba3e03ac6bf4fe899305acfa198267 freepops-0.0.99-r1.ebuild 1324
-SHA256 ba4a8149a24361bcd01836d5d764ebaf51ff22d6e57c4b63e0314a5c55210fad freepops-0.0.99-r1.ebuild 1324
-EBUILD freepops-0.0.99.ebuild 1231 RMD160 c591d642c932ed22ce79a7dcb92b53f766bd5709 SHA1 21872819a1e76a23abec33c3527ca5b491a93997 SHA256 27f747679bf07be6902f3d03e2a56dea385da53f5bc1036a99de262450f3724a
-MD5 13ed5671aca798f4785ed3f1504037e9 freepops-0.0.99.ebuild 1231
-RMD160 c591d642c932ed22ce79a7dcb92b53f766bd5709 freepops-0.0.99.ebuild 1231
-SHA256 27f747679bf07be6902f3d03e2a56dea385da53f5bc1036a99de262450f3724a freepops-0.0.99.ebuild 1231
-EBUILD freepops-0.2.0.ebuild 1326 RMD160 8e70a90d875a4971ba219b51adc21ddb55f800f4 SHA1 7dd8d9b05d14c664c0902dc6e420fc558ee9c979 SHA256 be72a4d01a0cad42a1570505f0a0f663095f8b504c50748e449bfe3d03a7983c
-MD5 94e028f27b125381302f140af88bfbb6 freepops-0.2.0.ebuild 1326
-RMD160 8e70a90d875a4971ba219b51adc21ddb55f800f4 freepops-0.2.0.ebuild 1326
-SHA256 be72a4d01a0cad42a1570505f0a0f663095f8b504c50748e449bfe3d03a7983c freepops-0.2.0.ebuild 1326
 EBUILD freepops-0.2.2-r1.ebuild 1539 RMD160 b9a747ca82159eb258459db83c857d6c7785f2b7 SHA1 e4225e90b95b235cd91ff5927afeb4b057890731 SHA256 90c1060a32184c0f99db06c571e59e4b78a751093371440d5da58f3c7fee45ab
 MD5 c8d90ffce8f1d46453d9dbe5fc9c19b6 freepops-0.2.2-r1.ebuild 1539
 RMD160 b9a747ca82159eb258459db83c857d6c7785f2b7 freepops-0.2.2-r1.ebuild 1539
 SHA256 90c1060a32184c0f99db06c571e59e4b78a751093371440d5da58f3c7fee45ab freepops-0.2.2-r1.ebuild 1539
-EBUILD freepops-0.2.2.ebuild 1496 RMD160 13bc0f756e31acb8d1a628615509e7c3da6dca4f SHA1 4283e0b22fd1c8f4849c6d9230761bdef91f30b4 SHA256 511c4e5da07110f0086538a427248aac24cc5ba5e20f66edc437df7c3dd9ac16
-MD5 58dac1f087ed401aedc0071723b499c2 freepops-0.2.2.ebuild 1496
-RMD160 13bc0f756e31acb8d1a628615509e7c3da6dca4f freepops-0.2.2.ebuild 1496
-SHA256 511c4e5da07110f0086538a427248aac24cc5ba5e20f66edc437df7c3dd9ac16 freepops-0.2.2.ebuild 1496
-MISC ChangeLog 5688 RMD160 dbae82c9c7353108a37b03fc94c1daddb4947bba SHA1 5c6b6acab365406903ddb336d298ce645c1496ca SHA256 f70b368fecc98d04115358be5ee6973075fff4a097a5d4d16e0b5899d450c8a6
-MD5 0dea47cc708fdc0ac5122155c008037a ChangeLog 5688
-RMD160 dbae82c9c7353108a37b03fc94c1daddb4947bba ChangeLog 5688
-SHA256 f70b368fecc98d04115358be5ee6973075fff4a097a5d4d16e0b5899d450c8a6 ChangeLog 5688
+EBUILD freepops-0.2.3.ebuild 1638 RMD160 9c5b37ca3e42e2a58c82efad0b2e37ac5be57267 SHA1 a9544079a475fcbcefc2d7ad6fef2c8512944a8e SHA256 89ff61c0db7a0c096dfbf75f27028f9f6b3b505b77add5c39625e818cd3ae38e
+MD5 10b1c2e0024cbdbcdaf76172d658f19a freepops-0.2.3.ebuild 1638
+RMD160 9c5b37ca3e42e2a58c82efad0b2e37ac5be57267 freepops-0.2.3.ebuild 1638
+SHA256 89ff61c0db7a0c096dfbf75f27028f9f6b3b505b77add5c39625e818cd3ae38e freepops-0.2.3.ebuild 1638
+MISC ChangeLog 5983 RMD160 5505aae73e247c09916fc70220a7bee4900533e9 SHA1 be08cb7dea7eaf96abdddb322f9b4855fc078030 SHA256 fda3674ac6a604c8d961d6c4174e561ffb16a1728d10e0b71aa90de1b9e9e7a4
+MD5 ef0de4b83ecaefd62a4c855d2c295528 ChangeLog 5983
+RMD160 5505aae73e247c09916fc70220a7bee4900533e9 ChangeLog 5983
+SHA256 fda3674ac6a604c8d961d6c4174e561ffb16a1728d10e0b71aa90de1b9e9e7a4 ChangeLog 5983
 MISC metadata.xml 288 RMD160 9156c20410e399eefadae2d44edaa536f0a93c0f SHA1 eb512ed96a043367e416d50996cc2ca9347e3e97 SHA256 313310f7c1c73fdab56202d7087ea4275c706996f4f9049cc1bdd7ddbabba9db
 MD5 c5cea2c71a3038980c2975d684e9e1fb metadata.xml 288
 RMD160 9156c20410e399eefadae2d44edaa536f0a93c0f metadata.xml 288
@@ -54,18 +44,9 @@ SHA256 313310f7c1c73fdab56202d7087ea4275c706996f4f9049cc1bdd7ddbabba9db metadata
 MD5 e58e18d4a332371786e495275bc3a5c3 files/digest-freepops-0.0.31 250
 RMD160 37c6a4170ef5376c9ccd53b01ecccf25f5a793bd files/digest-freepops-0.0.31 250
 SHA256 40f474648bc0900e1054efd707a18e3b1ec676fa18ab9b1d3944c84964ca63d0 files/digest-freepops-0.0.31 250
-MD5 d6f8a8827cfff8299495a5e82d4291e2 files/digest-freepops-0.0.99 250
-RMD160 ff14585805e3b6da07c9078d055c455e5af51cbb files/digest-freepops-0.0.99 250
-SHA256 b459159daa045530b0bfbd6db539f24bab28d1d9d010c824ad13ef7f7fd1010a files/digest-freepops-0.0.99 250
-MD5 63c0b3403aa5c967375e2276bde677ed files/digest-freepops-0.0.99-r1 554
-RMD160 94bf490c44042206bcef4acda732ac0f8cefaa47 files/digest-freepops-0.0.99-r1 554
-SHA256 bf9299768f3efbeb30d933b1991bab1a44dfe920bf2e0938bb5cda7419e01d72 files/digest-freepops-0.0.99-r1 554
-MD5 d759486b30d2e743dc29438648f84cf2 files/digest-freepops-0.2.0 247
-RMD160 3d17305e18c64cbc5fd73c3a6c98e59c394f729a files/digest-freepops-0.2.0 247
-SHA256 ffd1ad3d168bb9d07fd248f5b4b91f97f7cb2ddf486de6e9f404a8ed8a5d1725 files/digest-freepops-0.2.0 247
-MD5 3d156a0b89b831fe732efd61356c66c1 files/digest-freepops-0.2.2 247
-RMD160 294c3752ed40a34b39f1a4602667d2bf1e8ae298 files/digest-freepops-0.2.2 247
-SHA256 8bbb2e3670d13ffe1170e671723abb73f8fd3c9d22663e75d214175db5f0d19f files/digest-freepops-0.2.2 247
 MD5 3d156a0b89b831fe732efd61356c66c1 files/digest-freepops-0.2.2-r1 247
 RMD160 294c3752ed40a34b39f1a4602667d2bf1e8ae298 files/digest-freepops-0.2.2-r1 247
 SHA256 8bbb2e3670d13ffe1170e671723abb73f8fd3c9d22663e75d214175db5f0d19f files/digest-freepops-0.2.2-r1 247
+MD5 618d6211a97310a2b75ec59e79e0bea0 files/digest-freepops-0.2.3 247
+RMD160 1d099dfb7db6c9e17fa9b430a00b41d09ad46850 files/digest-freepops-0.2.3 247
+SHA256 d795942b1074f1d7be97902b29d45548566c1256bcddec71cb7a7a0b4fe0d1d4 files/digest-freepops-0.2.3 247
diff --git a/net-mail/freepops/files/digest-freepops-0.0.99 b/net-mail/freepops/files/digest-freepops-0.0.99
deleted file mode 100644
index 109be8e4bf90..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.0.99
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/net-mail/freepops/files/digest-freepops-0.0.99-r1 b/net-mail/freepops/files/digest-freepops-0.0.99-r1
deleted file mode 100644
index 7d4df6f1566f..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.0.99-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-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/digest-freepops-0.2.0 b/net-mail/freepops/files/digest-freepops-0.2.0
deleted file mode 100644
index ac35d94b5320..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b91472f67a8c2b2cc855fd8ae1988577 freepops-0.2.0.tar.gz 1782970
-RMD160 7291e7e8166baab92bd7480d6ba8e0f40c14a84e freepops-0.2.0.tar.gz 1782970
-SHA256 4e24595050efad0c5df40cb9286e8fea8aabfbeeca6cf7d6387f23ac8b60db5d freepops-0.2.0.tar.gz 1782970
diff --git a/net-mail/freepops/files/digest-freepops-0.2.2 b/net-mail/freepops/files/digest-freepops-0.2.2
deleted file mode 100644
index 68bb6e242d42..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8cd34d36523751d1b64c9bf471366925 freepops-0.2.2.tar.gz 1796281
-RMD160 ce0df112cd967f10746a5d9010d551f4bb8b66d9 freepops-0.2.2.tar.gz 1796281
-SHA256 bc74f03c548f5d7f23dcc49a51b9ab384783c5378d356bf942e9eb7109f88dc0 freepops-0.2.2.tar.gz 1796281
diff --git a/net-mail/freepops/files/digest-freepops-0.2.3 b/net-mail/freepops/files/digest-freepops-0.2.3
new file mode 100644
index 000000000000..341ae46a5e4e
--- /dev/null
+++ b/net-mail/freepops/files/digest-freepops-0.2.3
@@ -0,0 +1,3 @@
+MD5 963f97f623d8cd38fd5ef869e8c330de freepops-0.2.3.tar.gz 1885970
+RMD160 c1c96d65f76ab8814e3d9d0184bdc11fb11f73de freepops-0.2.3.tar.gz 1885970
+SHA256 1a1330de998121892c9f7a420c0b76b0b6c95899d68ffc5aa42370de36fd52d9 freepops-0.2.3.tar.gz 1885970
diff --git a/net-mail/freepops/files/freepops-0.2.3-pop3config.diff b/net-mail/freepops/files/freepops-0.2.3-pop3config.diff
new file mode 100644
index 000000000000..d6a06cf2033b
--- /dev/null
+++ b/net-mail/freepops/files/freepops-0.2.3-pop3config.diff
@@ -0,0 +1,39 @@
+--- modules/src/pop3server/popserver.c.orig	2007-05-19 09:49:10.000000000 +1000
++++ modules/src/pop3server/popserver.c	2007-05-19 09:49:25.000000000 +1000
+@@ -34,9 +34,7 @@
+ #include "popstate.h"
+ #include "threads.h"
+ 
+-#ifdef HAVE_CONFIG_H
+-	#include "config.h"
+-#endif
++#include "config.h"
+ 
+ #include "log.h"
+ #define LOG_ZONE "POPSERVER"
+--- ./src/engine.c.orig	2007-05-19 09:53:52.000000000 +1000
++++ ./src/engine.c	2007-05-19 09:54:16.000000000 +1000
+@@ -17,9 +17,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+  
+-#ifdef HAVE_CONFIG_H
+-#	include "config.h"
+-#endif
++#include "config.h"
+ 
+ #include "popserver.h"
+ #include "popstate.h"
+--- ./src/freepops.c.orig	2007-05-19 09:56:20.000000000 +1000
++++ ./src/freepops.c	2007-05-19 09:56:38.000000000 +1000
+@@ -47,9 +47,7 @@
+ 	#include <getopt.h>
+ #endif
+ 
+-#ifdef HAVE_CONFIG_H
+-#      include "config.h"
+-#endif
++#include "config.h"
+ 
+ #if CRYPTO_IMPLEMENTATION == 1
+ 	#include <pthread.h>
diff --git a/net-mail/freepops/freepops-0.0.99-r1.ebuild b/net-mail/freepops/freepops-0.0.99-r1.ebuild
deleted file mode 100644
index b4645758ec93..000000000000
--- a/net-mail/freepops/freepops-0.0.99-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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-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/${P}_updates_20070127.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnutls"
-
-RDEPEND=">=net-misc/curl-7.10.8
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-		<dev-lang/lua-5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}_updates_20070127.patch
-	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"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS README ChangeLog TODO \
-		"${D}"/usr/share/doc/${PN}/*
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	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
deleted file mode 100644
index ff7abc8270a9..000000000000
--- a/net-mail/freepops/freepops-0.0.99.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.2 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnutls"
-
-RDEPEND=">=net-misc/curl-7.10.8
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-		<dev-lang/lua-5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.0.97-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"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS README ChangeLog TODO \
-		"${D}"/usr/share/doc/${PN}/*
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	newinitd buildfactory/freePOPsd.initd freepopsd
-	newconfd buildfactory/freePOPsd.confd freepopsd
-}
diff --git a/net-mail/freepops/freepops-0.2.0.ebuild b/net-mail/freepops/freepops-0.2.0.ebuild
deleted file mode 100644
index bcd7d7353ebf..000000000000
--- a/net-mail/freepops/freepops-0.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.2.0.ebuild,v 1.1 2007/03/05 12:31:44 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="gnutls"
-
-RDEPEND=">=net-misc/curl-7.10.8
-		gnutls? ( net-libs/gnutls
-					dev-libs/libgcrypt )
-		!gnutls? ( dev-libs/openssl )
-		>=dev-lang/lua-5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/pkg-config lua/s/5.1//g' configure.sh
-}
-
-src_compile() {
-	# note fbsd and Darwin and osx targets exist here too
-	if use gnutls; then
-		./configure.sh linux-gnutls -lua || die "configure gnutls failed"
-		sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
-	else
-		./configure.sh linux-slack -lua || die "configure openssl failed"
-	fi
-	emake -j1 all || die "make failed"
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}" || die
-	dodoc AUTHORS README ChangeLog TODO \
-		"${D}"/usr/share/doc/${PN}/*
-	rm -rf "${D}"/usr/share/doc/${PN}
-	chmod a+x "${D}"/usr/bin/freepops-updater-dialog
-
-	newinitd buildfactory/freePOPsd.initd freepopsd
-	newconfd buildfactory/freePOPsd.confd freepopsd
-}
diff --git a/net-mail/freepops/freepops-0.2.2.ebuild b/net-mail/freepops/freepops-0.2.3.ebuild
index 027a9c1076fb..7e93e7caca4e 100644
--- a/net-mail/freepops/freepops-0.2.2.ebuild
+++ b/net-mail/freepops/freepops-0.2.3.ebuild
@@ -1,8 +1,8 @@
 # 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.2.2.ebuild,v 1.1 2007/04/19 10:26:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.2.3.ebuild,v 1.1 2007/05/19 00:47:18 dragonheart Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="WebMail->POP3 converter and more"
 HOMEPAGE="http://freepops.sourceforge.net/"
@@ -23,22 +23,25 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e '/pkg-config lua/s/5.1//g' configure.sh
+	sed -i -e '/PKGCONFIG lua/s/5.1//g' configure.sh
+	epatch "${FILESDIR}"/${P}-pop3config.diff
 }
 
 src_compile() {
+	tc-export CC CXX LD AR STRIP RANLIB
 	# note fbsd and Darwin and osx targets exist here too
 	if use gnutls; then
 		./configure.sh linux-gnutls -lua || die "configure gnutls failed"
-		sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
 	else
-		./configure.sh linux-slack -lua || die "configure openssl failed"
+		./configure.sh linux -lua || die "configure openssl failed"
 	fi
-	emake -j1 all || die "make failed"
+	sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
+	sed -i -e 's:var/lib/:usr/share/:g' config.h Makefile
+	emake -j1 H= all || die "make failed"
 }
 
 src_install() {
-	emake -j2 install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}" || die
 	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF}
 	dodoc AUTHORS README ChangeLog TODO
 	chmod a+x "${D}"/usr/bin/freepops-updater-dialog