multilib ready - remove old versions

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 24 insertions, 59 deletions

diff --git a/net-mail/qmail-autoresponder/ChangeLog b/net-mail/qmail-autoresponder/ChangeLog
index 979bd27c7778..3f2f768d9379 100644
--- a/net-mail/qmail-autoresponder/ChangeLog
+++ b/net-mail/qmail-autoresponder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/qmail-autoresponder
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/ChangeLog,v 1.41 2009/12/26 16:18:28 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/ChangeLog,v 1.42 2010/01/14 12:40:40 bangert Exp $
+
+*qmail-autoresponder-0.97-r2 (14 Jan 2010)
+
+  14 Jan 2010; Thilo Bangert <bangert@gentoo.org>
+  -qmail-autoresponder-0.96.2.ebuild, -qmail-autoresponder-0.97.ebuild,
+  +qmail-autoresponder-0.97-r2.ebuild:
+  multilib ready - remove old versions
 
   26 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   qmail-autoresponder-0.97-r1.ebuild:
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.96.2.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
index d5f2d76ba3e8..32a7b72f92c7 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.96.2.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/qmail-autoresponder-0.96.2.ebuild,v 1.14 2009/09/23 19:09:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild,v 1.1 2010/01/14 12:40:40 bangert Exp $
 
-inherit toolchain-funcs
+EAPI="2"
+
+inherit toolchain-funcs eutils multilib
 
 DESCRIPTION="Rate-limited autoresponder for qmail."
 HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
@@ -10,10 +12,10 @@ SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE="mysql"
 
-DEPEND=">=dev-libs/bglibs-1.019-r1
+DEPEND=">=dev-libs/bglibs-1.106
 	mysql? ( virtual/mysql )"
 RDEPEND="
 	${DEPEND}
@@ -21,12 +23,18 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 "
 
-src_compile() {
+src_prepare() {
+	use mysql || epatch	"${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
+}
+
+src_configure() {
 	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/lib/bglibs" > conf-bglibs
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
 
+src_compile() {
 	# fails on parallel builds!
 	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
 	if use mysql; then
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97.ebuild
deleted file mode 100644
index 4843ce410480..000000000000
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/qmail-autoresponder-0.97.ebuild,v 1.5 2009/09/23 19:09:37 patrick Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Rate-limited autoresponder for qmail."
-HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
-SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ~mips ~ppc ~sparc x86"
-IUSE="mysql"
-
-DEPEND=">=dev-libs/bglibs-1.022
-	mysql? ( virtual/mysql )"
-RDEPEND="
-	${DEPEND}
-	virtual/qmail
-	mysql? ( virtual/mysql )
-"
-
-src_compile() {
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/lib/bglibs" > conf-bglibs
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-
-	# fails on parallel builds!
-	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
-	if use mysql; then
-		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
-	fi
-}
-
-src_install () {
-	dobin qmail-autoresponder || die
-	doman qmail-autoresponder.1
-	if use mysql; then
-		dobin qmail-autoresponder-mysql || die
-		dodoc schema.mysql
-	fi
-
-	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
-}
-
-pkg_postinst() {
-	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
-}