summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2003-07-12 21:33:20 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2003-07-12 21:33:20 +0000
commit2236b2062bd2ba47a0270901e7c7e8ab41ad4776 (patch)
tree94e3c1d2a9d3a539b268e588692bf4c93c5fc048 /app-admin
parentunmasks and changelog fixes (diff)
downloadhistorical-2236b2062bd2ba47a0270901e7c7e8ab41ad4776.tar.gz
historical-2236b2062bd2ba47a0270901e7c7e8ab41ad4776.tar.bz2
historical-2236b2062bd2ba47a0270901e7c7e8ab41ad4776.zip
repoman and lintool fixes
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/addpatches/addpatches-0.2.ebuild6
-rw-r--r--app-admin/aide/aide-0.8.ebuild8
-rw-r--r--app-admin/aide/aide-0.9.ebuild4
-rw-r--r--app-admin/amanda/amanda-2.4.4-r1.ebuild63
-rw-r--r--app-admin/amanda/amanda-2.4.4.ebuild69
5 files changed, 77 insertions, 73 deletions
diff --git a/app-admin/addpatches/addpatches-0.2.ebuild b/app-admin/addpatches/addpatches-0.2.ebuild
index b595f11e9fbb..86e2088732f2 100644
--- a/app-admin/addpatches/addpatches-0.2.ebuild
+++ b/app-admin/addpatches/addpatches-0.2.ebuild
@@ -1,8 +1,12 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/addpatches/addpatches-0.2.ebuild,v 1.10 2003/07/04 22:44:06 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/addpatches/addpatches-0.2.ebuild,v 1.11 2003/07/12 21:33:19 aliz Exp $
DESCRIPTION="patch management script"
+HOMEPAGE="http://www.gentoo.org"
+DEPEND=""
+IUSE=""
+SRC_URI=""
SLOT="0"
LICENSE="as-is"
diff --git a/app-admin/aide/aide-0.8.ebuild b/app-admin/aide/aide-0.8.ebuild
index d0b385b32d1a..2ec107281983 100644
--- a/app-admin/aide/aide-0.8.ebuild
+++ b/app-admin/aide/aide-0.8.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/aide/aide-0.8.ebuild,v 1.15 2003/02/13 05:12:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.8.ebuild,v 1.16 2003/07/12 21:33:20 aliz Exp $
IUSE="nls postgres"
@@ -13,8 +13,8 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="x86 ppc -sparc "
-DEPEND="sys-apps/gzip
- sys-devel/bison
+DEPEND="sys-apps/gzip
+ sys-devel/bison
sys-devel/flex
dev-libs/libgcrypt
app-crypt/mhash
@@ -45,7 +45,7 @@ src_install() {
dodir /etc/aide
cp doc/aide.conf ${D}/etc/aide
- dodoc AUTHORS COPYING INSTALL NEWS README
+ dodoc AUTHORS COPYING INSTALL NEWS README
dohtml doc/manual.html
}
diff --git a/app-admin/aide/aide-0.9.ebuild b/app-admin/aide/aide-0.9.ebuild
index 1a4d7df2e7ac..0e5fe572b249 100644
--- a/app-admin/aide/aide-0.9.ebuild
+++ b/app-admin/aide/aide-0.9.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/aide/aide-0.9.ebuild,v 1.10 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.9.ebuild,v 1.11 2003/07/12 21:33:20 aliz Exp $
inherit eutils
@@ -53,6 +53,6 @@ src_install() {
insinto /etc/aide
doins doc/aide.conf
- dodoc AUTHORS NEWS README
+ dodoc AUTHORS NEWS README
dohtml doc/manual.html
}
diff --git a/app-admin/amanda/amanda-2.4.4-r1.ebuild b/app-admin/amanda/amanda-2.4.4-r1.ebuild
index 8f82f14a2e69..0e056968494e 100644
--- a/app-admin/amanda/amanda-2.4.4-r1.ebuild
+++ b/app-admin/amanda/amanda-2.4.4-r1.ebuild
@@ -1,8 +1,9 @@
# 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.3 2003/07/10 21:23:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r1.ebuild,v 1.4 2003/07/12 21:33:20 aliz Exp $
+
+inherit eutils
-inherit eutils
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
@@ -40,8 +41,8 @@ TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
amanda_variable_setup() {
# Setting vars
- local currentamanda
-
+ local currentamanda
+
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | xargs)"
use debug && einfo "Current settings: ${currentamanda}"
@@ -117,9 +118,9 @@ src_compile() {
einfo "Using '${AMANDA_DBMODE}' style database"
myconf="${myconf} --with-db=${AMANDA_DBMODE}"
- einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+ einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
- einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+ einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
@@ -138,17 +139,17 @@ src_compile() {
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
- if [ -n "${AMANDA_PORTS_UDP}" ]; then
- einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
- myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+ if [ -n "${AMANDA_PORTS_UDP}" ]; then
+ einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+ myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
- if [ -n "${AMANDA_PORTS_TCP}" ]; then
- einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
- myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+ if [ -n "${AMANDA_PORTS_TCP}" ]; then
+ einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+ myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
- if [ -n "${AMANDA_PORTS}" ]; then
- einfo "Using ports ${AMANDA_PORTS/,/-}"
- myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+ if [ -n "${AMANDA_PORTS}" ]; then
+ einfo "Using ports ${AMANDA_PORTS/,/-}"
+ myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
@@ -184,8 +185,8 @@ src_install() {
source ${TMPENVFILE}
einfo "Doing stock install"
- make DESTDIR=${D} install || die
-
+ make DESTDIR=${D} install || die
+
# Prepare our custom files
einfo "Building custom configuration files"
cp ${FILESDIR}/amanda-* ${MYFILESDIR}
@@ -239,45 +240,45 @@ src_install() {
# Labels
einfo "Installing labels"
docinto labels
- dodoc ${S}/example/3hole.ps
+ dodoc ${S}/example/3hole.ps
dodoc ${S}/example/8.5x11.ps
dodoc ${S}/example/DIN-A4.ps
- dodoc ${S}/example/DLT.ps
- dodoc ${S}/example/EXB-8500.ps
- dodoc ${S}/example/HP-DAT.ps
+ dodoc ${S}/example/DLT.ps
+ dodoc ${S}/example/EXB-8500.ps
+ dodoc ${S}/example/HP-DAT.ps
# Amanda example configs
einfo "Installing example configurations"
docinto example
- dodoc ${S}/example/*
+ dodoc ${S}/example/*
docinto example1
newdoc ${FILESDIR}/example_amanda.conf amanda.conf
newdoc ${FILESDIR}/example_disklist disklist
newdoc ${FILESDIR}/example_global.conf global.conf
docinto example2
- newdoc ${S}/example/amanda.conf amanda.conf
- newdoc ${S}/example/disklist disklist
+ newdoc ${S}/example/amanda.conf amanda.conf
+ newdoc ${S}/example/disklist disklist
# Compress it all
prepalldocs
# Just make sure it exists for XFS to work...
use xfs && keepdir ${D}/var/xfsdump/inventory
- insinto /etc/amanda
+ insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
- newins ${MYFILESDIR}/amanda-amandahosts amandahosts
+ newins ${MYFILESDIR}/amanda-amandahosts amandahosts
dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
insinto ${AMANDA_USER_HOMEDIR}
- einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+ einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins ${MYFILESDIR}/amanda-profile .profile
- einfo "Installing Sample Daily Cron Job for Amanda"
+ einfo "Installing Sample Daily Cron Job for Amanda"
CRONDIR=/etc/cron.daily/
- exeinto ${CRONDIR}
- newexe ${MYFILESDIR}/amanda-cron amanda
+ exeinto ${CRONDIR}
+ newexe ${MYFILESDIR}/amanda-cron amanda
# Not excetuable by default
fperms 644 ${CRONDIR}/amanda
- insinto /etc/amanda/${AMANDA_CONFIG_NAME}
+ insinto /etc/amanda/${AMANDA_CONFIG_NAME}
keepdir /etc/amanda
keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
diff --git a/app-admin/amanda/amanda-2.4.4.ebuild b/app-admin/amanda/amanda-2.4.4.ebuild
index 0488b0629367..02e99020bd1d 100644
--- a/app-admin/amanda/amanda-2.4.4.ebuild
+++ b/app-admin/amanda/amanda-2.4.4.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.ebuild,v 1.3 2003/06/26 22:04:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4.ebuild,v 1.4 2003/07/12 21:33:20 aliz Exp $
inherit eutils
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
@@ -64,9 +64,9 @@ src_compile() {
einfo "Using '${AMANDA_DBMODE}' style database"
myconf="${myconf} --with-db=${AMANDA_DBMODE}"
- einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+ einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
- einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+ einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
@@ -112,9 +112,9 @@ src_compile() {
econf ${myconf} || die "econf failed!"
emake || die "emake failed!"
- # Compile the tapetype program too
- cd tape-src
- emake tapetype || "emake tapetype failed!"
+ # Compile the tapetype program too
+ cd tape-src
+ emake tapetype || "emake tapetype failed!"
dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
perl ${S}/contrib/set_prod_link.pl
@@ -123,15 +123,14 @@ src_compile() {
src_install() {
-
- make DESTDIR=${D} install || die
+ make DESTDIR=${D} install || die
into /usr
- newsbin tape-src/tapetype tapetype
+ newsbin tape-src/tapetype tapetype
- dodoc AUTHORS C* INSTALL NEWS README
+ dodoc AUTHORS C* INSTALL NEWS README
docinto example
- dodoc ${S}/example/*
+ dodoc ${S}/example/*
docinto docs
dodoc ${S}/docs/*
prepalldocs
@@ -141,20 +140,20 @@ src_install() {
mkdir -p ${D}/var/xfsdump/inventory
fi
- # einfo "Installing Amandahosts File for ${AMANDA_SERVER}"
- insinto ${AMANDA_USER_HOMEDIR}
- newins ${FILESDIR}/amanda-amandahosts .amandahosts
- dosed "s/__AMANDA_SERVER__/${AMANDA_SERVER}/" ${AMANDA_USER_HOMEDIR}/.amandahosts
+ # einfo "Installing Amandahosts File for ${AMANDA_SERVER}"
+ insinto ${AMANDA_USER_HOMEDIR}
+ newins ${FILESDIR}/amanda-amandahosts .amandahosts
+ dosed "s/__AMANDA_SERVER__/${AMANDA_SERVER}/" ${AMANDA_USER_HOMEDIR}/.amandahosts
newins ${FILESDIR}/amanda-profile .profile
- # einfo "Installing Sample Daily Cron Job for Amanda"
+ # einfo "Installing Sample Daily Cron Job for Amanda"
CRONDIR=/etc/cron.daily/
- exeinto ${CDRONDIR}
- newexe ${FILESDIR}/amanda-cron amanda
+ exeinto ${CDRONDIR}
+ newexe ${FILESDIR}/amanda-cron amanda
dosed "s,__AMANDA_CONFIG_NAME__,${AMANDA_CONFIG_NAME},g" ${CRONDIR}/amanda
fperms 644 ${CRONDIR}/amanda
- insinto /etc/amanda/lbl
+ insinto /etc/amanda/lbl
newins ${S}/example/3hole.ps 3hole.ps
newins ${S}/example/8.5x11.ps 8.5x11.ps
newins ${S}/example/DIN-A4.ps DIN-A4.ps
@@ -168,16 +167,16 @@ src_install() {
newins ${FILESDIR}/example_disklist disklist
newins ${FILESDIR}/example_global.conf global.conf
insinto /etc/amanda/example2
- newins ${S}/example/amanda.conf amanda.conf
- newins ${S}/example/disklist disklist
+ newins ${S}/example/amanda.conf amanda.conf
+ newins ${S}/example/disklist disklist
# einfo "Installing Sample Daily Backup Configuration"
- insinto /etc/amanda/${AMANDA_CONFIG_NAME}
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} /etc/amanda
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} /etc/amanda/${AMANDA_CONFIG_NAME}
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} /etc/amanda/${AMANDA_CONFIG_NAME}/*
- fperms 700 /etc/amanda
- fperms 700 /etc/amanda/${AMANDA_CONFIG_NAME}
+ insinto /etc/amanda/${AMANDA_CONFIG_NAME}
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} /etc/amanda
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} /etc/amanda/${AMANDA_CONFIG_NAME}
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} /etc/amanda/${AMANDA_CONFIG_NAME}/*
+ fperms 700 /etc/amanda
+ fperms 700 /etc/amanda/${AMANDA_CONFIG_NAME}
local i
for i in amandates dumpdates; do
@@ -186,16 +185,16 @@ src_install() {
fperms 600 /etc/${i}
done
- dodir ${AMANDA_TAR_LISTDIR}
+ dodir ${AMANDA_TAR_LISTDIR}
dodir ${AMANDA_TMPDIR}
dodir ${AMANDA_TMPDIR}/dumps
- dodir ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_USER_HOMEDIR}
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_TAR_LISTDIR}
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_TMPDIR}
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_TMPDIR}/dumps
- fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}
- fperms 700 ${AMANDA_USER_HOMEDIR}
+ dodir ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_USER_HOMEDIR}
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_TAR_LISTDIR}
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_TMPDIR}
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_TMPDIR}/dumps
+ fowners ${AMANDA_USER_NAME}.${AMANDA_GROUP_NAME} ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}
+ fperms 700 ${AMANDA_USER_HOMEDIR}
# DevFS
insinto /etc/devfs.d