version bump

(Portage version: 2.1.2.7)

5 files changed, 21 insertions, 29 deletions

diff --git a/net-mail/freepops/ChangeLog b/net-mail/freepops/ChangeLog
index 420ebcd9eadd..d4859a0709b8 100644
--- a/net-mail/freepops/ChangeLog
+++ b/net-mail/freepops/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2007/05/19 00:47:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.31 2007/05/27 09:12:26 dragonheart Exp $
+
+*freepops-0.2.4 (27 May 2007)
+
+  27 May 2007; Daniel Black <dragonheart@gentoo.org>
+  -files/freepops-0.2.2-gcrypt.patch, -freepops-0.2.2-r1.ebuild,
+  +freepops-0.2.4.ebuild:
+  version bump
 
 *freepops-0.2.3 (19 May 2007)
 
diff --git a/net-mail/freepops/files/digest-freepops-0.2.2-r1 b/net-mail/freepops/files/digest-freepops-0.2.2-r1
deleted file mode 100644
index 68bb6e242d42..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.2.2-r1
+++ /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.4 b/net-mail/freepops/files/digest-freepops-0.2.4
new file mode 100644
index 000000000000..d2b70059294d
--- /dev/null
+++ b/net-mail/freepops/files/digest-freepops-0.2.4
@@ -0,0 +1,3 @@
+MD5 d18848b903ceb68a53ded6b6d9e33047 freepops-0.2.4.tar.gz 1889995
+RMD160 1e971c5bcbe87e66e80d0c7ef64b165e5f4587e0 freepops-0.2.4.tar.gz 1889995
+SHA256 ad18e29744501c68672947f4002d9eb8852668f84069dd9a31d0a42743558250 freepops-0.2.4.tar.gz 1889995
diff --git a/net-mail/freepops/files/freepops-0.2.2-gcrypt.patch b/net-mail/freepops/files/freepops-0.2.2-gcrypt.patch
deleted file mode 100644
index 182279c27538..000000000000
--- a/net-mail/freepops/files/freepops-0.2.2-gcrypt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/freepops.c.orig	2007-05-11 07:33:04.000000000 +1000
-+++ src/freepops.c	2007-05-11 07:35:02.000000000 +1000
-@@ -452,8 +452,12 @@
- 
- 
- #if CRYPTO_IMPLEMENTATION == 1
-+	if (!gcry_check_version("1.2.2")) {
-+		fprintf(stderr, "gcrypt version older than 1.2.2\n");
-+		exit(1);
-+	}
- 	gcry_control(GCRYCTL_SET_THREAD_CBS,&gcry_threads_pthread);
--	gcry_check_version("1.2.2");
-+	gcry_control (GCRYCTL_DISABLE_SECMEM, 0); 
- #endif
- 	
- 	curl_global_init(CURL_GLOBAL_ALL);
diff --git a/net-mail/freepops/freepops-0.2.2-r1.ebuild b/net-mail/freepops/freepops-0.2.4.ebuild
index 8d533a3c9962..cd74f4d116c3 100644
--- a/net-mail/freepops/freepops-0.2.2-r1.ebuild
+++ b/net-mail/freepops/freepops-0.2.4.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-r1.ebuild,v 1.1 2007/05/10 21:42:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.2.4.ebuild,v 1.1 2007/05/27 09:12:26 dragonheart Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="WebMail->POP3 converter and more"
 HOMEPAGE="http://freepops.sourceforge.net/"
@@ -23,26 +23,27 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcrypt.patch
-	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}"/${PN}-0.2.3-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
 
 	newinitd buildfactory/gentoo/freePOPsd.initd freepopsd
 	newconfd buildfactory/gentoo/freePOPsd.confd freepopsd