added hotmail.lua patch as per homepage. removed old versions

Package-Manager: portage-2.1_pre4-r1

8 files changed, 47 insertions, 106 deletions

diff --git a/net-mail/freepops/ChangeLog b/net-mail/freepops/ChangeLog
index 7e30fae3e1e4..fa8a5f08c673 100644
--- a/net-mail/freepops/ChangeLog
+++ b/net-mail/freepops/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2006/02/08 21:55:14 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.20 2006/02/09 11:04:40 dragonheart Exp $
+
+*freepops-0.0.97-r1 (09 Feb 2006)
+
+  09 Feb 2006; Daniel Black <dragonheart@gentoo.org>
+  -files/freepops-0.0.27-initd.patch, -freepops-0.0.27-r1.ebuild,
+  -freepops-0.0.95.ebuild, +freepops-0.0.97-r1.ebuild:
+  added hotmail.lua patch as per homepage. removed old versions
 
 *freepops-0.0.97 (08 Feb 2006)
 
diff --git a/net-mail/freepops/Manifest b/net-mail/freepops/Manifest
index 070905e9611c..4d31d73f3092 100644
--- a/net-mail/freepops/Manifest
+++ b/net-mail/freepops/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0213e8fe006f069268f3ac8d2a4917d0 ChangeLog 3123
-RMD160 307a9836986664e030631a6664a4bea4d9d03b43 ChangeLog 3123
-SHA256 87c7c35ddbd93d5e902e3434e840beb962234b7abc8dcc076188e695912c25ae ChangeLog 3123
-MD5 d7ca204372719b1d3fa4aca59cf9a442 files/digest-freepops-0.0.27-r1 68
-RMD160 faf0b1d0d4d02d87aabdf480e6d5e351a652e05b files/digest-freepops-0.0.27-r1 68
-SHA256 0f827b940fa23aa19283d3c5abab2a885ae8f5de155cae082a4fcff530efd6e0 files/digest-freepops-0.0.27-r1 68
+MD5 4727f9e8dc65b28a1364ed835b13c003 ChangeLog 3397
+RMD160 4e046fa9dc91621e2656c92080f7d3111a5b110d ChangeLog 3397
+SHA256 6f28cdc24fdcb9cf13d85891cd1ed5cb1b4abe425b153589542437f016b0da21 ChangeLog 3397
 MD5 787d8c0e312170927dde02eadb05f199 files/digest-freepops-0.0.31 68
 RMD160 c9dfb79b7d5ffddc2249713168b508ff28b6457c files/digest-freepops-0.0.31 68
 SHA256 599d0d34b98210ef208d66468404f082d4cb66218acb5b110fe9db9e076b2f30 files/digest-freepops-0.0.31 68
-MD5 cc59d60c97a67dab4adc6379cd88c6cc files/digest-freepops-0.0.95 68
-RMD160 8a378a61989fc56fd1c48ada225fa70f0d7e7126 files/digest-freepops-0.0.95 68
-SHA256 79728ebd4c72b88205895fab8857391084050393a5f3fb217a5e1fbe20b9f251 files/digest-freepops-0.0.95 68
 MD5 21ee5999234bdb82080dda6b28f0e2d1 files/digest-freepops-0.0.96 68
 RMD160 ab9480fb4890dc038e15c3b842f754f512c24d33 files/digest-freepops-0.0.96 68
 SHA256 bb338deed6e6da09817c9c9cb88edb121685df4d12ac1eb5f70f844edbb4f49c files/digest-freepops-0.0.96 68
 MD5 8711bb3f89904131b5a9acef59e4c3ee files/digest-freepops-0.0.97 250
 RMD160 e3fe7f1a33cf13d5a0baea9a1e1d68f7829e0fd7 files/digest-freepops-0.0.97 250
 SHA256 ba49a95060d00388af06fc91b2a3b07ec1e8bd6491ab2702f62bcf97902b3c61 files/digest-freepops-0.0.97 250
-MD5 87de47c4792aa1687b9d521a4e4c313a files/freepops-0.0.27-initd.patch 634
-RMD160 b711ccad88acb5043b8c2fcb114ac2016b8c9492 files/freepops-0.0.27-initd.patch 634
-SHA256 afddccc99281e911bb44aad84873d9be50af8fdb20376e654dbe4777acdcd2cb files/freepops-0.0.27-initd.patch 634
+MD5 0a4dea94fd78c15092d925a722baf65c files/digest-freepops-0.0.97-r1 461
+RMD160 cd106e5cb745e1272d9ce5f80e136c1214b4b05a files/digest-freepops-0.0.97-r1 461
+SHA256 9c0d84f4f7a53c125a232a00c5fbc3f3df06f7a396331ec4a97fc40cf87d28c5 files/digest-freepops-0.0.97-r1 461
 MD5 21057de46bc1ad28a002f98771043d47 files/freepops-0.0.31-srcmake.patch 466
 RMD160 a4816afa18a1bc79ac8a9e92da7939e99b9f35b2 files/freepops-0.0.31-srcmake.patch 466
 SHA256 3060aa25d84ac2618acf2317bfc4a2ac0077fca9e0bbbe67e64d16beb9a3b250 files/freepops-0.0.31-srcmake.patch 466
@@ -31,18 +25,15 @@ SHA256 3060aa25d84ac2618acf2317bfc4a2ac0077fca9e0bbbe67e64d16beb9a3b250 files/fr
 MD5 937f449869f442fb48666c7089c39a8d files/freepops-0.0.97-system-lua.patch 7623
 RMD160 dc539e432fec202b54c44b4090e27a43279ae922 files/freepops-0.0.97-system-lua.patch 7623
 SHA256 8dfccb48bbd75e0aeb043ab13f8d06c41ec9ffb2b1010f43171eb82b9d742476 files/freepops-0.0.97-system-lua.patch 7623
-MD5 6f0c9ab8babd9f09d69f1d197fc1f0cc freepops-0.0.27-r1.ebuild 1193
-RMD160 e8dfc92c0f8429a0dc5bf046cd9938d785ad8d4d freepops-0.0.27-r1.ebuild 1193
-SHA256 57629a12eff6faa6f31ebbdce57313b7c5a7792d808eb69e71305ed58e784754 freepops-0.0.27-r1.ebuild 1193
 MD5 98c599d235e47a75f8ddee78c4ec2b83 freepops-0.0.31.ebuild 1190
 RMD160 5216a4ef75265a41615b86b637db6e79a4f51b9d freepops-0.0.31.ebuild 1190
 SHA256 a6c50a0b09cd024f4eda0ff78600b6d77fe587c32ff743dd532c1d734c35bf88 freepops-0.0.31.ebuild 1190
-MD5 1a8363d9df6cb6f3dd72da2d5b31ffbf freepops-0.0.95.ebuild 1192
-RMD160 e55e32656beffdaa51f05f8b875ebcd978c4a66d freepops-0.0.95.ebuild 1192
-SHA256 c0cf18edb855c658cc51a57683ff8ae4ed58bb0cc6ccc5db78f883bd4f5dec69 freepops-0.0.95.ebuild 1192
 MD5 0a2bda7247ec44c0df51233f3a1c3edd freepops-0.0.96.ebuild 1193
 RMD160 b609c5275aab678239ad9edbc75ade5b4603b7bd freepops-0.0.96.ebuild 1193
 SHA256 2284c3c1fe3e51f7672e6ea4277a895bdf09293cdd57f18cbc5935a2221a03ca freepops-0.0.96.ebuild 1193
+MD5 3270500f8abb5d52b64f170071b312f5 freepops-0.0.97-r1.ebuild 1555
+RMD160 4947a7d3ea6845481a479dd44c9b574e56053061 freepops-0.0.97-r1.ebuild 1555
+SHA256 417dcb20a406ecb0c638ab446de01c7149576865ae5fdb276a23efe54825125f freepops-0.0.97-r1.ebuild 1555
 MD5 fea9126f90c14969caa97bef24472dd0 freepops-0.0.97.ebuild 1446
 RMD160 95e46dbb0359df8cc72393e11410b994d7de1e95 freepops-0.0.97.ebuild 1446
 SHA256 eb5083689b43e7b30d4e91f7bd2f5f92c1a62cf9b936e9e63a9feea818551a3a freepops-0.0.97.ebuild 1446
@@ -52,7 +43,7 @@ SHA256 313310f7c1c73fdab56202d7087ea4275c706996f4f9049cc1bdd7ddbabba9db metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFD6nQgmdTrptrqvGERAs05AJoC6xcfbF6XnJPJ7QTOeFdzsmgQXwCeMpHx
-9Dep0dj4W54YupLWpTBVzAY=
-=oq1V
+iD8DBQFD6y3amdTrptrqvGERAi2cAJ9bGUFiaSvB5PgqQjE5atxSWhaEAQCff2Wn
+TRMADfpo8KtY0oBFUByfxtM=
+=Kn5h
 -----END PGP SIGNATURE-----
diff --git a/net-mail/freepops/files/digest-freepops-0.0.27-r1 b/net-mail/freepops/files/digest-freepops-0.0.27-r1
deleted file mode 100644
index 0da614b3f833..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.0.27-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4842a2666ec8e439fd08e1f38a46d4e freepops-0.0.27.tar.gz 1851699
diff --git a/net-mail/freepops/files/digest-freepops-0.0.95 b/net-mail/freepops/files/digest-freepops-0.0.95
deleted file mode 100644
index 6a35ef2be7ef..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.0.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b1704f12e605938ed631d70cd1c3f01 freepops-0.0.95.tar.gz 1887702
diff --git a/net-mail/freepops/files/digest-freepops-0.0.97-r1 b/net-mail/freepops/files/digest-freepops-0.0.97-r1
new file mode 100644
index 000000000000..bdc5722c37db
--- /dev/null
+++ b/net-mail/freepops/files/digest-freepops-0.0.97-r1
@@ -0,0 +1,6 @@
+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
+MD5 48d6e9e172e72c85b76dca1ed1473f92 hotmail.lua 46375
+RMD160 466786cedf71278d0aaadd1cf22267f4b4193879 hotmail.lua 46375
+SHA256 ed873ef9f3e5ffa018c10773dd949a3cdd8f4e5172caa3d3ba447ef98e286b7a hotmail.lua 46375
diff --git a/net-mail/freepops/files/freepops-0.0.27-initd.patch b/net-mail/freepops/files/freepops-0.0.27-initd.patch
deleted file mode 100644
index 589bc88718cd..000000000000
--- a/net-mail/freepops/files/freepops-0.0.27-initd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Drop root privs by default.
-
---- buildfactory/freePOPsd.initd
-+++ buildfactory/freePOPsd.initd
-@@ -35,6 +35,9 @@
- 	if  [ ${USER_NAME} ] && [ ${USER_PASSWD} ]; then	 
- 		ARGS="${ARGS} -A ${USER_NAME}:${USER_PASSWD}"
- 	fi	
-+	if [ ${SUID_USER} ] && [ ${SUID_GROUP} ]; then
-+		ARGS="${ARGS} -s ${SUID_USER}.${SUID_GROUP}"
-+	fi
- 	start-stop-daemon --start  --exec /usr/bin/freepopsd \
- 		-- -d ${ARGS} 
- 	eend ${?}
---- buildfactory/freePOPsd.confd
-+++ buildfactory/freePOPsd.confd
-@@ -24,3 +24,6 @@
- # USER_NAME=""
- # USER_PASSWD=""
- 
-+# You can drop root privs by changing to this username/group
-+SUID_USER="nobody"
-+SUID_GROUP="nogroup"
diff --git a/net-mail/freepops/freepops-0.0.27-r1.ebuild b/net-mail/freepops/freepops-0.0.27-r1.ebuild
deleted file mode 100644
index 18e083a59e20..000000000000
--- a/net-mail/freepops/freepops-0.0.27-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.27-r1.ebuild,v 1.2 2005/05/05 23:20:58 swegener 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"
-
-RDEPEND=">=net-misc/curl-7.10.8"
-DEPEND="${RDEPEND}
-	>=sys-apps/portage-2.0.51
-	doc? (
-		>=app-doc/doxygen-1.3
-		app-text/tetex
-		virtual/ghostscript
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-initd.patch #86271
-	chmod a+r $(find . -name '*.lua') #89612
-}
-
-src_compile() {
-	./configure.sh linux || die "configure failed"
-	emake -j1 all WHERE=/usr/ || die "make failed"
-	if use doc ; then
-		emake -j1 doc || die "make doc failed"
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" WHERE=/usr/ || die
-	dodoc AUTHORS README ChangeLog TODO \
-		"${D}"/usr/share/doc/${PN}/MANUAL.txt
-	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.95.ebuild b/net-mail/freepops/freepops-0.0.97-r1.ebuild
index 013148203d2d..152f6872b0c4 100644
--- a/net-mail/freepops/freepops-0.0.95.ebuild
+++ b/net-mail/freepops/freepops-0.0.97-r1.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.95.ebuild,v 1.1 2005/10/28 23:15:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.97-r1.ebuild,v 1.1 2006/02/09 11:04:40 dragonheart Exp $
 
 inherit eutils
 
 DESCRIPTION="WebMail->POP3 converter and more"
 HOMEPAGE="http://freepops.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freepops/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/freepops/${P}.tar.gz
+		http://diludovico.org/freepops/plugins/hotmail.lua"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
+IUSE="doc gnutls"
 
-RDEPEND=">=net-misc/curl-7.10.8"
+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
@@ -22,21 +26,27 @@ DEPEND="${RDEPEND}
 	)"
 
 src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-srcmake.patch"
+	unpack "${P}.tar.gz"
+	epatch "${FILESDIR}/${P}-system-lua.patch"
+	cp "${DISTDIR}/hotmail.lua" "${S}/src/lua"
 }
 
 src_compile() {
-	./configure.sh linux || die "configure failed"
-	emake -j1 all WHERE=/usr/ || die "make failed"
+	# 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}" WHERE=/usr/ || die
+	make install DESTDIR="${D}" || die
 	dodoc AUTHORS README ChangeLog TODO \
 		"${D}"/usr/share/doc/${PN}/*
 	rm -rf "${D}"/usr/share/doc/${PN}