5 files changed, 47 insertions, 46 deletions

diff --git a/net-mail/vacation/ChangeLog b/net-mail/vacation/ChangeLog
index bb4efcab35d6..dd6cb09c501e 100644
--- a/net-mail/vacation/ChangeLog
+++ b/net-mail/vacation/ChangeLog
@@ -1,8 +1,16 @@
 # ChangeLog for net-mail/vacation
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/ChangeLog,v 1.12 2007/08/24 20:01:12 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/ChangeLog,v 1.13 2008/07/31 07:32:12 phosphan Exp $
 
-  24 Aug 2007; Raúl Porcel <armin76@gentoo.org> vacation-1.2.6.2.ebuild,
+*vacation-1.2.7.0 (31 Jul 2008)
+
+  31 Jul 2008; Patrick Kursawe <phosphan@gentoo.org>
+  -vacation-1.2.6.1.ebuild, vacation-1.2.6.2.ebuild,
+  vacation-1.2.6.3.ebuild, +vacation-1.2.7.0.ebuild:
+  Version bump, bug #231379. Fixed some unquoted variables, removed obsolete
+  version 1.2.6.1.
+
+  24 Aug 2007; Raúl Porcel <armin76@gentoo.org> vacation-1.2.6.2.ebuild,
   vacation-1.2.6.3.ebuild:
   alpha stable wrt #189111
 
@@ -18,7 +26,7 @@
   +vacation-1.2.6.3.ebuild:
   Version bump. Also installing vaclook now.
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
 *vacation-1.2.6.2 (23 Oct 2006)
diff --git a/net-mail/vacation/vacation-1.2.6.1.ebuild b/net-mail/vacation/vacation-1.2.6.1.ebuild
deleted file mode 100644
index 2fa9c787f056..000000000000
--- a/net-mail/vacation/vacation-1.2.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.6.1.ebuild,v 1.9 2006/10/23 11:11:37 phosphan Exp $
-
-DESCRIPTION="automatic mail answering program"
-HOMEPAGE="http://vacation.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sourceforge/vacation/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86 alpha ~amd64"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/mta
-	sys-libs/gdbm"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	mv vacation.man vacation.1
-	sed -i -e 's: -m486::; s:CFLAGS.*= \(.*\):CFLAGS += \1:' Makefile
-}
-
-src_compile () {
-	emake CFLAGS="${CFLAGS}" || die "emake failed."
-}
-
-src_install () {
-	dobin vacation
-	dodoc AUTHORS ChangeLog README README.smrsh
-	doman vacation.1
-}
diff --git a/net-mail/vacation/vacation-1.2.6.2.ebuild b/net-mail/vacation/vacation-1.2.6.2.ebuild
index b3cb22aaf469..f5bf51522510 100644
--- a/net-mail/vacation/vacation-1.2.6.2.ebuild
+++ b/net-mail/vacation/vacation-1.2.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.6.2.ebuild,v 1.4 2007/08/24 20:01:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.6.2.ebuild,v 1.5 2008/07/31 07:32:12 phosphan Exp $
 
 DESCRIPTION="automatic mail answering program"
 HOMEPAGE="http://vacation.sourceforge.net/"
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}
 
 src_unpack () {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	mv vacation.man vacation.1
 	sed -i -e 's: -m486::; s:CFLAGS.*= \(.*\):CFLAGS += \1:' Makefile
 }
diff --git a/net-mail/vacation/vacation-1.2.6.3.ebuild b/net-mail/vacation/vacation-1.2.6.3.ebuild
index 710439c44b7d..300f1021967f 100644
--- a/net-mail/vacation/vacation-1.2.6.3.ebuild
+++ b/net-mail/vacation/vacation-1.2.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.6.3.ebuild,v 1.2 2007/08/24 20:01:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.6.3.ebuild,v 1.3 2008/07/31 07:32:12 phosphan Exp $
 
 inherit toolchain-funcs
 
@@ -24,6 +24,6 @@ src_compile () {
 src_install () {
 	dodir /usr/bin
 	dodir /usr/man/man1
-	make BINDIR=${D}usr/bin MANDIR=${D}usr/man/man install || die
+	make BINDIR="${D}usr/bin" MANDIR="${D}usr/man/man" install || die
 "make install failed"
 }
diff --git a/net-mail/vacation/vacation-1.2.7.0.ebuild b/net-mail/vacation/vacation-1.2.7.0.ebuild
new file mode 100644
index 000000000000..77c8330db385
--- /dev/null
+++ b/net-mail/vacation/vacation-1.2.7.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.7.0.ebuild,v 1.1 2008/07/31 07:32:12 phosphan Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="automatic mail answering program"
+HOMEPAGE="http://vacation.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vacation/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="virtual/mta
+	sys-libs/gdbm"
+DEPEND="${RDEPEND}
+	!mail-mta/sendmail"
+
+src_compile () {
+	emake CC=$(tc-getCC) ARCH=$(tc-arch-kernel) CFLAGS="${CFLAGS} -DMAIN" || die "emake failed."
+}
+
+src_install () {
+	dodir /usr/bin
+	dodir /usr/man/man1
+	make BINDIR="${D}usr/bin" MANDIR="${D}usr/man/man" install || die
+"make install failed"
+}