From: Alin Năstac Date: Sun, 12 Mar 2006 18:50:17 +0000 (+0000) Subject: Remove unnecessary dependency to virtual/libc, as well as X USE flag. Add die message... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7255d49263521727497973975d2f262a7cf76e0a;p=gentoo.git Remove unnecessary dependency to virtual/libc, as well as X USE flag. Add die messages. Quote $FILESDIR, $D and $ROOT. Package-Manager: portage-2.0.54 --- diff --git a/net-dialup/mwavem/ChangeLog b/net-dialup/mwavem/ChangeLog index 87290784a3c8..4c5220dfc242 100644 --- a/net-dialup/mwavem/ChangeLog +++ b/net-dialup/mwavem/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/mwavem -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.7 2005/10/04 19:27:04 mrness Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.8 2006/03/12 18:50:17 mrness Exp $ + + 12 Mar 2006; Alin Nastac mwavem-2.0.ebuild: + Remove unnecessary dependency to virtual/libc, as well as X USE flag. Add + die messages. Quote $FILESDIR, $D and $ROOT. 04 Oct 2005; Alin Nastac mwavem-2.0.ebuild: Remove INSTALL from docs. diff --git a/net-dialup/mwavem/Manifest b/net-dialup/mwavem/Manifest index 7460abca432e..8b670beb7123 100644 --- a/net-dialup/mwavem/Manifest +++ b/net-dialup/mwavem/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 cc860c2894489089b70ea1656406a8a1 mwavem-2.0.ebuild 1685 -MD5 675d06ecbfd05ce0755d4e049d1c6f28 ChangeLog 1803 -MD5 62bd2d669ff76fcf6145dd0f91deafa9 metadata.xml 379 -MD5 6a2110cacb03948288203ca53d4c9535 files/mwave.devfs 150 +MD5 fd05b53379cc4be64f2ed189daed48c7 ChangeLog 1993 MD5 3763c7ee83d898c35fb878ead9398918 files/digest-mwavem-2.0 63 MD5 779ead17ce93702aa87513e41030ba40 files/mwave-dev-handler 210 +MD5 6a2110cacb03948288203ca53d4c9535 files/mwave.devfs 150 MD5 8ceb387439cc272ebcfbf455eef22ec1 files/mwave.modules 30 +MD5 62bd2d669ff76fcf6145dd0f91deafa9 metadata.xml 379 +MD5 87457e4205ce96bd17cc4fcbc5cd65a9 mwavem-2.0.ebuild 1698 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFDQtejNSP4Vda7IdsRAmJNAJ4yyee6ewvvsnDAvl9VOAIeha/BwACgiDi6 -taAML2VMB78EBN2yuLxzu2w= -=GgOw +iD8DBQFEFG16jG8pv1lIUX4RAoUtAJ4iw1WkTUWWx/rtR9ZqymURzm1esACdGYt1 +SJTueqn96pXvs92+fP7LgFE= +=8SXD -----END PGP SIGNATURE----- diff --git a/net-dialup/mwavem/mwavem-2.0.ebuild b/net-dialup/mwavem/mwavem-2.0.ebuild index 503f4abd2f02..b3bf8abfc50b 100644 --- a/net-dialup/mwavem/mwavem-2.0.ebuild +++ b/net-dialup/mwavem/mwavem-2.0.ebuild @@ -1,8 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-2.0.ebuild,v 1.4 2005/10/04 19:27:04 mrness Exp $ - -inherit eutils +# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-2.0.ebuild,v 1.5 2006/03/12 18:50:17 mrness Exp $ DESCRIPTION="User level application for IBM Mwave modem" HOMEPAGE="http://oss.software.ibm.com/acpmodem/" @@ -11,30 +9,28 @@ SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86" -IUSE="X" - -DEPEND="virtual/libc" +IUSE="" src_compile() { #Disable installing stuff outside sandbox sed -i -e 's/^install-exec-local:.*$/&\n\ninstall-exec-local-invalid:/' \ src/mwavem/Makefile.am src/mwavem/Makefile.in - econf || die "./configure failed" - emake || die + econf || die "econf failed" + emake || die "emake failed" } src_install() { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die "make install failed" exeinto /usr/sbin - doexe ${FILESDIR}/mwave-dev-handler + doexe "${FILESDIR}/mwave-dev-handler" insinto /etc/devfs.d - newins ${FILESDIR}/mwave.devfs mwave + newins "${FILESDIR}/mwave.devfs" mwave insinto /etc/modules.d - newins ${FILESDIR}/mwave.modules mwave + newins "${FILESDIR}/mwave.modules" mwave dodoc AUTHORS ChangeLog FAQ NEWS README README.devfs THANKS docinto doc @@ -44,20 +40,20 @@ src_install() { pkg_postinst() { # Below is to get /etc/modules.d/mwave loaded into /etc/modules.conf - [ -x ${ROOT}/usr/sbin/update-modules ] && ${ROOT}/usr/sbin/update-modules + [ -x "${ROOT}/usr/sbin/update-modules" ] && "${ROOT}/usr/sbin/update-modules" - if [ -e ${ROOT}/dev/.devfsd ]; then + if [ -e "${ROOT}/dev/.devfsd" ]; then # device node is created by devfs ebegin "Restarting devfsd to reread devfs rules" killall -HUP devfsd eend $? - elif [ -e ${ROOT}/dev/.udev ]; then + elif [ -e "${ROOT}/dev/.udev" ]; then #the device should be created by udev ebegin "Restarting udev to reread udev rules" udevstart eend $? else - [ ! -d ${ROOT}/dev/modem ] && mkdir --mode=0755 ${ROOT}/dev/modems - mknod --mode=0660 ${ROOT}/dev/modems/mwave c 10 219 + [ ! -d "${ROOT}/dev/modem" ] && mkdir --mode=0755 "${ROOT}/dev/modems" + mknod --mode=0660 "${ROOT}/dev/modems/mwave" c 10 219 fi }