Fixes for pre-stripped binaries and wrong man path according to bug #233248.

(Portage version: 2.1.4.4)

3 files changed, 33 insertions, 15 deletions

diff --git a/net-mail/vacation/ChangeLog b/net-mail/vacation/ChangeLog
index 55591c68301a..b1488d014c8a 100644
--- a/net-mail/vacation/ChangeLog
+++ b/net-mail/vacation/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for net-mail/vacation
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/ChangeLog,v 1.15 2008/08/02 09:13:58 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/ChangeLog,v 1.16 2008/08/10 19:50:09 phosphan Exp $
 
-  01 Aug 2008; Raúl Porcel <armin76@gentoo.org> vacation-1.2.6.3.ebuild:
+  10 Aug 2008; Patrick Kursawe <phosphan@gentoo.org>
+  vacation-1.2.6.3.ebuild, vacation-1.2.7.0.ebuild:
+  Fixes for pre-stripped binaries and wrong man path according to bug #233248.
+
+  01 Aug 2008; Raúl Porcel <armin76@gentoo.org> vacation-1.2.6.3.ebuild:
   alpha/x86 stable wrt #233248
 
 *vacation-1.2.7.0 (31 Jul 2008)
@@ -13,7 +17,7 @@
   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,
+  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
 
@@ -29,7 +33,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.3.ebuild b/net-mail/vacation/vacation-1.2.6.3.ebuild
index c0e5a7b8a6ac..f3e7ef17dfaa 100644
--- a/net-mail/vacation/vacation-1.2.6.3.ebuild
+++ b/net-mail/vacation/vacation-1.2.6.3.ebuild
@@ -1,14 +1,14 @@
 # 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.4 2008/08/01 18:02:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.6.3.ebuild,v 1.5 2008/08/10 19:50:09 phosphan Exp $
 
-inherit toolchain-funcs
+inherit eutils 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"
+KEYWORDS="alpha ~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
@@ -17,13 +17,20 @@ RDEPEND="virtual/mta
 DEPEND="${RDEPEND}
 	!mail-mta/sendmail"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:install -s -m:install -m:" Makefile
+}
+
 src_compile () {
 	emake CC=$(tc-getCC) ARCH=$(tc-arch-kernel) CFLAGS="${CFLAGS}" || 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"
+	dodir /usr/share/man/man1
+	emake BINDIR="${D}/usr/bin" MANDIR="${D}usr/share/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
index 77c8330db385..70ac2ce875c8 100644
--- a/net-mail/vacation/vacation-1.2.7.0.ebuild
+++ b/net-mail/vacation/vacation-1.2.7.0.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vacation/vacation-1.2.7.0.ebuild,v 1.2 2008/08/10 19:50:09 phosphan Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="automatic mail answering program"
 HOMEPAGE="http://vacation.sourceforge.net/"
@@ -17,13 +17,20 @@ RDEPEND="virtual/mta
 DEPEND="${RDEPEND}
 	!mail-mta/sendmail"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:install -s -m:install -m:" Makefile
+}
+
 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"
+	dodir /usr/share/man/man1
+	emake BINDIR="${D}/usr/bin" MANDIR="${D}usr/share/man/man" install || die \
+	"make install failed"
 }