From 2ed16820af5938414bf315027956df3ab5199a55 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 18 Oct 2002 23:57:49 +0000 Subject: [PATCH] lintool fixes per #9258 --- sys-apps/aboot/aboot-0.9-r1.ebuild | 54 +++++++++++++---------------- sys-apps/ami/ami-1.0.11-r1.ebuild | 55 +++++++++++++++--------------- sys-apps/ami/ami-1.0.11-r2.ebuild | 55 +++++++++++++++--------------- sys-apps/apmd/apmd-3.0.2-r3.ebuild | 5 ++- sys-apps/at/at-3.1.8-r3.ebuild | 44 +++++++++++------------- sys-apps/at/at-3.1.8-r6.ebuild | 8 ++--- sys-apps/at/at-3.1.8-r7.ebuild | 6 ++-- sys-apps/at/at-3.1.8-r8.ebuild | 6 ++-- 8 files changed, 106 insertions(+), 127 deletions(-) diff --git a/sys-apps/aboot/aboot-0.9-r1.ebuild b/sys-apps/aboot/aboot-0.9-r1.ebuild index 7ade8d510a70..915506a1e13f 100644 --- a/sys-apps/aboot/aboot-0.9-r1.ebuild +++ b/sys-apps/aboot/aboot-0.9-r1.ebuild @@ -1,5 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/aboot/aboot-0.9-r1.ebuild,v 1.3 2002/10/18 23:57:49 vapier Exp $ S=${WORKDIR}/${P} DESCRIPTION="Alpha Linux boot loader for srm" @@ -8,15 +9,12 @@ HOMEPAGE="http://aboot.sourceforge.net/" KEYWORDS="alpha" SLOT="0" -LICENSE="gpl-2" +LICENSE="GPL-2" DEPEND="virtual/glibc" - -RDEPEND="virtual/glibc" - +RDEPEND="${DEPEND}" src_unpack() { - unpack ${A} mv ${WORKDIR}/aboot-0.9bpre ${WORKDIR}/${P} @@ -27,12 +25,10 @@ src_unpack() { } src_compile() { - emake || die } src_install() { - dodir /{boot,sbin,usr/share/man/man5} make \ root=${D} \ @@ -46,31 +42,27 @@ src_install() { dodir /etc insinto /etc newins ${FILESDIR}/aboot.conf aboot.conf.example - } pkg_postinst() { - - einfo "To make aboot install a new bootloader on your harddisk follow" - einfo "these steps:" - einfo "" - einfo " - edit the file /etc/aboot.conf" - einfo " - cd /boot" - einfo " - swriteboot -c2 /dev/sda bootlx" - einfo " This will install a new bootsector on /dev/sda and aboot will" - einfo " use the second partition on this device to lookup kernel and " - einfo " initrd (as described in the aboot.conf file)" - einfo "" - einfo "IMPORTANT :" - einfo "" - einfo "The partition table of your boot device has to contain " - einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device" - einfo "must not be part of a partition as aboot will write its bootloader" - einfo "in there and not as with most x86 bootloaders into the " - einfo "master boot sector. If your partition table does not reflect this" - einfo "you are going to destroy your installation !" - einfo "Also note that aboot currently only supports ext2/3 partitions" - einfo "to boot from." - + einfo "To make aboot install a new bootloader on your harddisk follow" + einfo "these steps:" + einfo "" + einfo " - edit the file /etc/aboot.conf" + einfo " - cd /boot" + einfo " - swriteboot -c2 /dev/sda bootlx" + einfo " This will install a new bootsector on /dev/sda and aboot will" + einfo " use the second partition on this device to lookup kernel and " + einfo " initrd (as described in the aboot.conf file)" + einfo "" + einfo "IMPORTANT :" + einfo "" + einfo "The partition table of your boot device has to contain " + einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device" + einfo "must not be part of a partition as aboot will write its bootloader" + einfo "in there and not as with most x86 bootloaders into the " + einfo "master boot sector. If your partition table does not reflect this" + einfo "you are going to destroy your installation !" + einfo "Also note that aboot currently only supports ext2/3 partitions" + einfo "to boot from." } - diff --git a/sys-apps/ami/ami-1.0.11-r1.ebuild b/sys-apps/ami/ami-1.0.11-r1.ebuild index 02afd7de8483..ae86399bad3c 100644 --- a/sys-apps/ami/ami-1.0.11-r1.ebuild +++ b/sys-apps/ami/ami-1.0.11-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/ami/ami-1.0.11-r1.ebuild,v 1.7 2002/10/04 06:22:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ami/ami-1.0.11-r1.ebuild,v 1.8 2002/10/18 23:57:49 vapier Exp $ S=${WORKDIR}/${P} DESCRIPTION="Korean IMS Ami" SRC_URI="http://www.kr.freebsd.org/~hwang/ami/${P}.tar.gz - http://www.kr.freebsd.org/~hwang/ami/hanja.dic.gz + http://www.kr.freebsd.org/~hwang/ami/hanja.dic.gz ftp://ftp.nnongae.com/pub/gentoo/${P}.patch" HOMEPAGE="http://www.kr.freebsd.org/~hwang/ami/index.html" KEYWORDS="x86" @@ -13,44 +13,43 @@ SLOT="0" LICENSE="GPL-2" DEPEND=">=media-libs/gdk-pixbuf-0.7.0" +RDEPEND="${DEPEND}" src_unpack() { - unpack ${P}.tar.gz - + unpack ${A} patch -p0 < ${DISTDIR}/${P}.patch || die } src_compile() { - local config + local config - use gnome && config="--enable-gnome-applet" + use gnome && config="--enable-gnome-applet" - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --with-hangul-keyboard=2 \ - --sysconfdir=/etc \ - ${config} \ - --mandir=/usr/share/man || die "./configure failed" + ./configure \ + --host=${CHOST} \ + --prefix=/usr \ + --infodir=/usr/share/info \ + --with-hangul-keyboard=2 \ + --sysconfdir=/etc \ + ${config} \ + --mandir=/usr/share/man || die "./configure failed" - emake || die + emake || die - cd ${S}/hanjadic - emake || die + cd ${S}/hanjadic + emake || die } -src_install () { - - make \ - prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - sysconfdir=${D}/etc \ - install || die +src_install() { + make \ + prefix=${D}/usr \ + mandir=${D}/usr/share/man \ + infodir=${D}/usr/share/info \ + sysconfdir=${D}/etc \ + install || die - gzip -d -c ${DISTDIR}/hanja.dic.gz > ${D}/usr/share/ami/hanja.dic + gzip -d -c ${DISTDIR}/hanja.dic.gz > ${D}/usr/share/ami/hanja.dic - dobin ${S}/hanjadic/hanja-hwp2ami - dodoc AUTHORS COPYING* ChangeLog INSTALL README README.en NEWS THANKS + dobin ${S}/hanjadic/hanja-hwp2ami + dodoc AUTHORS COPYING* ChangeLog INSTALL README README.en NEWS THANKS } diff --git a/sys-apps/ami/ami-1.0.11-r2.ebuild b/sys-apps/ami/ami-1.0.11-r2.ebuild index 0f242501c946..f384b1ea420c 100644 --- a/sys-apps/ami/ami-1.0.11-r2.ebuild +++ b/sys-apps/ami/ami-1.0.11-r2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/ami/ami-1.0.11-r2.ebuild,v 1.6 2002/10/04 06:22:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ami/ami-1.0.11-r2.ebuild,v 1.7 2002/10/18 23:57:49 vapier Exp $ S=${WORKDIR}/${P} DESCRIPTION="Korean IMS Ami" SRC_URI="http://www.kr.freebsd.org/~hwang/ami/${P}.tar.gz - http://www.kr.freebsd.org/~hwang/ami/hanja.dic.gz + http://www.kr.freebsd.org/~hwang/ami/hanja.dic.gz ftp://ftp.nnongae.com/pub/gentoo/${P}.patch" HOMEPAGE="http://www.kr.freebsd.org/~hwang/ami/index.html" KEYWORDS="x86 ppc sparc sparc64" @@ -13,45 +13,44 @@ SLOT="0" LICENSE="GPL-2" DEPEND=">=media-libs/gdk-pixbuf-0.7.0" +RDEPEND="${DEPEND}" src_unpack() { - unpack ${P}.tar.gz - + unpack ${A} patch -p0 < ${DISTDIR}/${P}.patch || die } src_compile() { - local config + local config - # remove gnome-applet for GNOME2 + # remove gnome-applet for GNOME2 #use gnome && config="--enable-gnome-applet" - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --with-hangul-keyboard=2 \ - --sysconfdir=/etc \ - ${config} \ - --mandir=/usr/share/man || die "./configure failed" + ./configure \ + --host=${CHOST} \ + --prefix=/usr \ + --infodir=/usr/share/info \ + --with-hangul-keyboard=2 \ + --sysconfdir=/etc \ + ${config} \ + --mandir=/usr/share/man || die "./configure failed" - emake || die + emake || die - cd ${S}/hanjadic - emake || die + cd ${S}/hanjadic + emake || die } -src_install () { - - make \ - prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - sysconfdir=${D}/etc \ - install || die +src_install() { + make \ + prefix=${D}/usr \ + mandir=${D}/usr/share/man \ + infodir=${D}/usr/share/info \ + sysconfdir=${D}/etc \ + install || die - gzip -d -c ${DISTDIR}/hanja.dic.gz > ${D}/usr/share/ami/hanja.dic + gzip -d -c ${DISTDIR}/hanja.dic.gz > ${D}/usr/share/ami/hanja.dic - dobin ${S}/hanjadic/hanja-hwp2ami - dodoc AUTHORS COPYING* ChangeLog INSTALL README README.en NEWS THANKS + dobin ${S}/hanjadic/hanja-hwp2ami + dodoc AUTHORS COPYING* ChangeLog INSTALL README README.en NEWS THANKS } diff --git a/sys-apps/apmd/apmd-3.0.2-r3.ebuild b/sys-apps/apmd/apmd-3.0.2-r3.ebuild index ae0b14b6f1da..a8708b306539 100644 --- a/sys-apps/apmd/apmd-3.0.2-r3.ebuild +++ b/sys-apps/apmd/apmd-3.0.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.5 2002/10/05 05:39:24 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.6 2002/10/18 23:57:49 vapier Exp $ IUSE="X" @@ -12,12 +12,11 @@ S=${WORKDIR}/${PN} DEPEND="virtual/glibc >=sys-apps/debianutils-1.16 X? ( virtual/x11 )" RDEPEND=${DEPEND} -LICENSE="GPL" +LICENSE="GPL-2" SLOT=0 KEYWORD="x86" src_unpack() { - unpack ${A} ; cd ${S} cp Makefile Makefile.orig diff --git a/sys-apps/at/at-3.1.8-r3.ebuild b/sys-apps/at/at-3.1.8-r3.ebuild index 5b1740b7627d..e142c81f0592 100644 --- a/sys-apps/at/at-3.1.8-r3.ebuild +++ b/sys-apps/at/at-3.1.8-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r3.ebuild,v 1.10 2002/10/04 06:46:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r3.ebuild,v 1.11 2002/10/18 23:57:49 vapier Exp $ S=${WORKDIR}/${P} DESCRIPTION="queues jobs for later execution" @@ -12,34 +12,30 @@ SLOT="0" LICENSE="GPL-2" DEPEND="virtual/glibc >=sys-devel/flex-2.5.4a" - RDEPEND="virtual/glibc" src_unpack() { - - unpack ${P}.tar.bz2 - cd ${S} - patch -p0 < ${DISTDIR}/${P}.dif || die - cp configure.in configure.orig - patch -p0 < ${FILESDIR}/${P}-configure.in-sendmail-gentoo.diff || die - patch -p0 < ${FILESDIR}/${P}-configure-sendmail-gentoo.diff || die + unpack ${A} + cd ${S} + patch -p0 < ${DISTDIR}/${P}.dif || die + cp configure.in configure.orig + patch -p0 < ${FILESDIR}/${P}-configure.in-sendmail-gentoo.diff || die + patch -p0 < ${FILESDIR}/${P}-configure-sendmail-gentoo.diff || die } src_compile() { - - ./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \ - --with-jobdir=/var/cron/atjobs \ - --with-atspool=/var/cron/atspool \ - --with-etcdir=/etc/at \ - --with-daemon_username=at \ - --with-daemon_groupname=at - assert - - emake || die + ./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \ + --with-jobdir=/var/cron/atjobs \ + --with-atspool=/var/cron/atspool \ + --with-etcdir=/etc/at \ + --with-daemon_username=at \ + --with-daemon_groupname=at + assert + + emake || die } src_install() { - into /usr chmod 755 batch chmod 755 atrun @@ -51,10 +47,10 @@ src_install() { for i in atjobs atspool do - dodir /var/cron/${i} - fperms 700 /var/cron/${i} - fowners at.at /var/cron/${i} - touch ${D}/var/cron/${i}/.SEQ + dodir /var/cron/${i} + fperms 700 /var/cron/${i} + fowners at.at /var/cron/${i} + touch ${D}/var/cron/${i}/.SEQ done exeinto /etc/rc.d/init.d diff --git a/sys-apps/at/at-3.1.8-r6.ebuild b/sys-apps/at/at-3.1.8-r6.ebuild index 0fca6b4b1699..0a03c23da5ea 100644 --- a/sys-apps/at/at-3.1.8-r6.ebuild +++ b/sys-apps/at/at-3.1.8-r6.ebuild @@ -1,23 +1,21 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r6.ebuild,v 1.7 2002/10/04 06:22:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r6.ebuild,v 1.8 2002/10/18 23:57:49 vapier Exp $ S=${WORKDIR}/${P} DESCRIPTION="Queues jobs for later execution" SRC_URI="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.tar.bz2 ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.dif" -HOMEPAGE="" +HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/" KEYWORDS="x86" SLOT="0" LICENSE="GPL-2" DEPEND="virtual/glibc >=sys-devel/flex-2.5.4a" - RDEPEND="virtual/glibc" src_unpack() { - - unpack ${P}.tar.bz2 + unpack ${A} cd ${S} patch -p0 < ${DISTDIR}/${P}.dif || die cp configure.in configure.orig diff --git a/sys-apps/at/at-3.1.8-r7.ebuild b/sys-apps/at/at-3.1.8-r7.ebuild index 253005483aca..05acbafacd3e 100644 --- a/sys-apps/at/at-3.1.8-r7.ebuild +++ b/sys-apps/at/at-3.1.8-r7.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r7.ebuild,v 1.5 2002/10/04 06:22:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r7.ebuild,v 1.6 2002/10/18 23:57:49 vapier Exp $ S=${WORKDIR}/${P} DESCRIPTION="Queues jobs for later execution" SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz" -HOMEPAGE="" +HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/" KEYWORDS="x86" SLOT="0" LICENSE="GPL-2" @@ -14,7 +14,6 @@ DEPEND="virtual/glibc >=sys-devel/flex-2.5.4a" RDEPEND="virtual/glibc" src_compile() { - ./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \ --with-jobdir=/var/cron/atjobs \ --with-atspool=/var/cron/atspool \ @@ -25,7 +24,6 @@ src_compile() { } src_install() { - into /usr chmod 755 batch chmod 755 atrun diff --git a/sys-apps/at/at-3.1.8-r8.ebuild b/sys-apps/at/at-3.1.8-r8.ebuild index 23c264c264eb..d7cabda4c91b 100644 --- a/sys-apps/at/at-3.1.8-r8.ebuild +++ b/sys-apps/at/at-3.1.8-r8.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r8.ebuild,v 1.7 2002/10/04 06:22:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r8.ebuild,v 1.8 2002/10/18 23:57:49 vapier Exp $ S=${WORKDIR}/${P} DESCRIPTION="Queues jobs for later execution" SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz" -HOMEPAGE="" +HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/" KEYWORDS="x86 ppc sparc sparc64" SLOT="0" LICENSE="GPL-2" @@ -14,7 +14,6 @@ DEPEND="virtual/glibc >=sys-devel/flex-2.5.4a" RDEPEND="virtual/glibc virtual/mta" src_compile() { - ./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \ --with-jobdir=/var/cron/atjobs \ --with-atspool=/var/cron/atspool \ @@ -25,7 +24,6 @@ src_compile() { } src_install() { - into /usr chmod 755 batch chmod 755 atrun -- 2.26.2