version bump and remove old

(Portage version: 2.1.10/cvs/Linux x86_64)

3 files changed, 27 insertions, 45 deletions

diff --git a/mail-filter/imapfilter/ChangeLog b/mail-filter/imapfilter/ChangeLog
index 18c6df8c1fa3..e421607f95ba 100644
--- a/mail-filter/imapfilter/ChangeLog
+++ b/mail-filter/imapfilter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/imapfilter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/ChangeLog,v 1.34 2011/03/27 19:25:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/ChangeLog,v 1.35 2011/06/11 15:15:59 eras Exp $
+
+*imapfilter-2.2.3 (11 Jun 2011)
+
+  11 Jun 2011; Eray Aslan <eras@gentoo.org> -imapfilter-2.0.10.ebuild,
+  -imapfilter-2.0.11.ebuild, +imapfilter-2.2.3.ebuild:
+  Version bump and remove old.
 
   27 Mar 2011; Brent Baude <ranger@gentoo.org> imapfilter-2.2.2.ebuild:
   stable ppc, bug 345341
diff --git a/mail-filter/imapfilter/imapfilter-2.0.10.ebuild b/mail-filter/imapfilter/imapfilter-2.0.10.ebuild
deleted file mode 100644
index 791bf1cc136f..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.0.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.0.10.ebuild,v 1.4 2009/09/23 17:53:33 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="http://imapfilter.hellug.gr"
-SRC_URI="http://imapfilter.hellug.gr/source/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	dev-libs/libpcre
-	>=dev-lang/lua-5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"/${P}
-
-	# http://lists.hellug.gr/pipermail/imapfilter-devel/2008/000606.html
-	epatch "${FILESDIR}/${P}-deprecated.patch"
-	# econf not possible
-	./configure -p /usr -b /usr/bin -s /usr/share/imapfilter -m /usr/share/man
-}
-
-src_compile() {
-	emake MYCFLAGS="${CFLAGS}" || die "parallel make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README sample.config.lua sample.extend.lua
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.0.11.ebuild b/mail-filter/imapfilter/imapfilter-2.2.3.ebuild
index e18f40ba11d2..f62cc6cbb718 100644
--- a/mail-filter/imapfilter/imapfilter-2.0.11.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.2.3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.0.11.ebuild,v 1.1 2009/10/23 10:35:24 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.2.3.ebuild,v 1.1 2011/06/11 15:15:59 eras Exp $
+
+EAPI=4
 
 inherit toolchain-funcs
 
 DESCRIPTION="An IMAP mail filtering utility"
 HOMEPAGE="http://imapfilter.hellug.gr"
-SRC_URI="http://imapfilter.hellug.gr/source/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/lefcha/imapfilter/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
@@ -18,13 +20,24 @@ RDEPEND="dev-libs/openssl
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}"
 
-src_compile() {
+src_prepare() {
+	# /usr/local -> /usr
+	sed -i -e "/incdirs/s:local/::g" \
+		-e "/libdirs/s:local/::g" \
+		configure
+}
+
+src_configure() {
 	# econf not possible
 	./configure -p /usr -b /usr/bin -s /usr/share/imapfilter -m /usr/share/man || die "configure failed"
-	emake MYCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "parallel make failed"
+}
+
+src_compile() {
+	emake MYCFLAGS="${CFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README sample.config.lua sample.extend.lua || die "dodoc failed"
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README samples/*
+	doman doc/imapfilter.1 doc/imapfilter_config.5
 }