fix bug #24158 and move to x86

3 files changed, 21 insertions, 11 deletions

diff --git a/app-admin/amanda/ChangeLog b/app-admin/amanda/ChangeLog
index 78f70c7b574f..a1e06ba35318 100644
--- a/app-admin/amanda/ChangeLog
+++ b/app-admin/amanda/ChangeLog
@@ -1,13 +1,20 @@
 # ChangeLog for app-admin/amanda
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.3 2003/07/08 20:22:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.4 2003/07/10 21:23:38 robbat2 Exp $
 
-  08 Jul 2003; Robin Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild:
+  10 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild:
+  Marking as stable on x86 as it works in a production environment for me.
+
+  10 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild:
+  Fix bug #24158 
+  Move the amandahosts file to /etc/amanda, and provide a symlink to it.
+
+  08 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild:
   Fix userpriv+sandbox issue in ebuild.
 
 *amanda-2.4.4-r1 (08 Jul 2003)
 
-  08 Jul 2003; Robin Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild,
+  08 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild,
   files/amanda-amandahosts, files/amanda-inetd.amanda.sample,
   files/amanda-profile, files/amanda-xinetd:
   Large improvements to the ebuild configuration system, using the same
@@ -17,7 +24,7 @@
 
 *amanda-2.4.4 (26 Jun 2003)
 
-  26 June 2003; Robin Johnson <robbat2@gentoo.org> Manifest,
+  26 June 2003; Robin H. Johnson <robbat2@gentoo.org> Manifest,
   files/amanda-devfs, files/example_disklist, files/amanda-cron,
   files/amanda-xinetd, files/amanda-profile, files/example_amanda.conf,
   files/amanda-amandahosts, files/digest-amanda-2.4.4,
diff --git a/app-admin/amanda/Manifest b/app-admin/amanda/Manifest
index 6f70c01dd612..fb6af05bde76 100644
--- a/app-admin/amanda/Manifest
+++ b/app-admin/amanda/Manifest
@@ -1,6 +1,6 @@
 MD5 b2f5b785a20a1b356e58629612c0aab5 amanda-2.4.4.ebuild 8488
-MD5 87daca03d4bbdfa615dfa441d56acd9d amanda-2.4.4-r1.ebuild 11279
-MD5 a03ba3fafc823632b740a59ea29061e4 ChangeLog 1750
+MD5 69fccb96f6650794761d8182c73ec291 amanda-2.4.4-r1.ebuild 11279
+MD5 33b631fd89a91b024814ef964af6740f ChangeLog 1750
 MD5 b21569120561b1c58ad59e93ce6df732 files/amanda-devfs 216
 MD5 fe28f64731a2dbf85f76b6f38942e032 files/example_disklist 55
 MD5 a98390eb2ab16398b7332c42560c190f files/amanda-cron 419
diff --git a/app-admin/amanda/amanda-2.4.4-r1.ebuild b/app-admin/amanda/amanda-2.4.4-r1.ebuild
index 0be4dda32b98..8f82f14a2e69 100644
--- a/app-admin/amanda/amanda-2.4.4-r1.ebuild
+++ b/app-admin/amanda/amanda-2.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r1.ebuild,v 1.2 2003/07/08 20:22:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r1.ebuild,v 1.3 2003/07/10 21:23:38 robbat2 Exp $
 
 inherit eutils 
 DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.amanda.org/"
 SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 DEPEND="sys-libs/readline
 		virtual/inetd
 		virtual/mta
@@ -207,10 +207,11 @@ src_install() {
 		sed -re "${sedexpr}" <${i} >${MYFILESDIR}/${filename}
 	done
 
+
+
 	# Build the envdir file
 	# Don't forget this..
 	einfo "Building environment file"
-	echo "CONFIG_PROTECT=${AMANDA_USER_HOMEDIR}/.amandahosts" >${MYFILESDIR}/${ENVDFILE}
 	echo "# These settings are what was present in the environment when this" >>${MYFILESDIR}/${ENVDFILE}
 	echo "# Amanda was compiled.  Changing anything below this comment will" >>${MYFILESDIR}/${ENVDFILE}
 	echo "# have no effect on your application, but it merely exists to" >>${MYFILESDIR}/${ENVDFILE}
@@ -261,9 +262,11 @@ src_install() {
 	# Just make sure it exists for XFS to work...
 	use xfs && keepdir ${D}/var/xfsdump/inventory
 
+    insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+    newins ${MYFILESDIR}/amanda-amandahosts amandahosts
+	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
 	insinto ${AMANDA_USER_HOMEDIR}
-    einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-    newins ${MYFILESDIR}/amanda-amandahosts .amandahosts
     einfo "Installing .profile for ${AMANDA_USER_NAME} user"
 	newins ${MYFILESDIR}/amanda-profile .profile