9 files changed, 19 insertions, 25 deletions
diff --git a/gnustep-libs/smbkit/smbkit-0.0.1.20050521.ebuild b/gnustep-libs/smbkit/smbkit-0.0.1.20050521.ebuild
index c6cefaa57582..ecdb65baa727 100644
--- a/gnustep-libs/smbkit/smbkit-0.0.1.20050521.ebuild
+++ b/gnustep-libs/smbkit/smbkit-0.0.1.20050521.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/smbkit/smbkit-0.0.1.20050521.ebuild,v 1.1 2005/06/06 07:12:34 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/smbkit/smbkit-0.0.1.20050521.ebuild,v 1.2 2005/07/09 15:44:50 swegener Exp $
 
 inherit gnustep
 
-S=${WORKDIR}/${PN}-${PV}
-
 DESCRIPTION="SMBKit offers a samba library and headers for GNUstep."
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
@@ -21,4 +19,3 @@ RDEPEND="${GS_RDEPEND}
 	net-fs/samba"
 
 egnustep_install_domain "System"
-
diff --git a/gnustep-libs/smbkit/smbkit-0.0.1_pre20050106.ebuild b/gnustep-libs/smbkit/smbkit-0.0.1_pre20050106.ebuild
index ec03f06bd2a2..619a9c2f9b06 100644
--- a/gnustep-libs/smbkit/smbkit-0.0.1_pre20050106.ebuild
+++ b/gnustep-libs/smbkit/smbkit-0.0.1_pre20050106.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/smbkit/smbkit-0.0.1_pre20050106.ebuild,v 1.1 2005/01/10 16:25:09 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/smbkit/smbkit-0.0.1_pre20050106.ebuild,v 1.2 2005/07/09 15:44:50 swegener Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -28,4 +28,3 @@ RDEPEND="${GS_RDEPEND}
 	net-fs/samba"
 
 egnustep_install_domain "System"
-
diff --git a/mail-client/exmh/exmh-2.5-r1.ebuild b/mail-client/exmh/exmh-2.5-r1.ebuild
index 47ac4e91cd84..58cdde0d8c94 100644
--- a/mail-client/exmh/exmh-2.5-r1.ebuild
+++ b/mail-client/exmh/exmh-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5-r1.ebuild,v 1.1 2004/08/08 11:24:42 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5-r1.ebuild,v 1.2 2005/07/09 15:41:36 swegener Exp $
 
 inherit eutils
 DESCRIPTION="An X user interface for MH mail"
@@ -26,7 +26,7 @@ src_unpack() {
 	cd ${S}
 	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
 	mv exmh.l exmh.1
-	epatch ${FILESDIR}/exmh-2.5-conf.patch
+	epatch ${FILESDIR}/${P}-conf.patch
 	cd misc
 	rm -rf RPM *tar* *gbuffy*
 	for i in *
diff --git a/mail-client/exmh/exmh-2.5.ebuild b/mail-client/exmh/exmh-2.5.ebuild
index 0723baf76e89..172bfa876e42 100644
--- a/mail-client/exmh/exmh-2.5.ebuild
+++ b/mail-client/exmh/exmh-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5.ebuild,v 1.4 2004/08/08 11:24:42 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5.ebuild,v 1.5 2005/07/09 15:41:36 swegener Exp $
 
 inherit eutils
 DESCRIPTION="An X user interface for MH mail"
@@ -26,7 +26,7 @@ src_unpack() {
 	cd ${S}
 	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
 	mv exmh.l exmh.1
-	epatch ${FILESDIR}/exmh-2.5-conf.patch
+	epatch ${FILESDIR}/${P}-conf.patch
 	cd misc
 	rm -rf RPM *tar* *gbuffy*
 	for i in *
diff --git a/mail-client/exmh/exmh-2.6.3-r1.ebuild b/mail-client/exmh/exmh-2.6.3-r1.ebuild
index 65902d2d0468..00860181f583 100644
--- a/mail-client/exmh/exmh-2.6.3-r1.ebuild
+++ b/mail-client/exmh/exmh-2.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.6.3-r1.ebuild,v 1.4 2004/09/25 21:57:28 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.6.3-r1.ebuild,v 1.5 2005/07/09 15:41:36 swegener Exp $
 
 inherit eutils
 DESCRIPTION="An X user interface for MH mail"
@@ -26,7 +26,7 @@ src_unpack() {
 	cd ${S}
 	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
 	mv exmh.l exmh.1
-	epatch ${FILESDIR}/exmh-${PV}-conf.patch
+	epatch ${FILESDIR}/${P}-conf.patch
 	cd misc
 	rm -rf RPM *tar* *gbuffy*
 	for i in *
diff --git a/mail-client/exmh/exmh-2.6.3.ebuild b/mail-client/exmh/exmh-2.6.3.ebuild
index 6066c23a5642..e8cba2ef9b4f 100644
--- a/mail-client/exmh/exmh-2.6.3.ebuild
+++ b/mail-client/exmh/exmh-2.6.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.6.3.ebuild,v 1.6 2004/09/22 23:37:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.6.3.ebuild,v 1.7 2005/07/09 15:41:36 swegener Exp $
 
 inherit eutils
 
 DESCRIPTION="An X user interface for MH mail"
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
 HOMEPAGE="http://beedub.com/exmh/"
 
 SLOT="0"
@@ -27,7 +27,7 @@ src_unpack() {
 	cd ${S}
 	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
 	mv exmh.l exmh.1
-	epatch ${FILESDIR}/exmh-${PV}-conf.patch
+	epatch ${FILESDIR}/${P}-conf.patch
 	cd misc
 	rm -rf RPM *tar* *gbuffy*
 	for i in *
@@ -54,6 +54,6 @@ src_install() {
 
 	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
 
-	dodir /usr/lib/${PN}-${PV}
-	install -m 644 lib/* ${D}/usr/lib/${PN}-${PV}
+	dodir /usr/lib/${P}
+	install -m 644 lib/* ${D}/usr/lib/${P}
 }
diff --git a/mail-client/exmh/exmh-2.7.0.ebuild b/mail-client/exmh/exmh-2.7.0.ebuild
index d8549f13c40a..14d25bb4e9ff 100644
--- a/mail-client/exmh/exmh-2.7.0.ebuild
+++ b/mail-client/exmh/exmh-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.7.0.ebuild,v 1.3 2004/12/17 17:38:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.7.0.ebuild,v 1.4 2005/07/09 15:41:36 swegener Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_unpack() {
 	cd ${S}
 	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
 	mv exmh.l exmh.1
-	epatch ${FILESDIR}/exmh-${PV}-conf.patch
+	epatch ${FILESDIR}/${P}-conf.patch
 	cd misc
 	rm -rf RPM *tar* *gbuffy*
 	for i in *
diff --git a/media-gfx/mkgallery/mkgallery-1.1.ebuild b/media-gfx/mkgallery/mkgallery-1.1.ebuild
index e9066b25ac90..1afc9e160357 100644
--- a/media-gfx/mkgallery/mkgallery-1.1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mkgallery/mkgallery-1.1.ebuild,v 1.8 2005/06/05 12:17:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mkgallery/mkgallery-1.1.ebuild,v 1.9 2005/07/09 15:42:30 swegener Exp $
 
 DESCRIPTION="Creates thumbnails and a HTML index file for a directory of jpg files"
 HOMEPAGE="http://mkgallery.sourceforge.net/"
-SRC_URI="http://mkgallery.sourceforge.net/${PN}-${PV}.tgz"
+SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc sparc x86"
diff --git a/net-dns/pdnsd/pdnsd-1.1.10.ebuild b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
index 6451585f1be3..a658b10127e2 100644
--- a/net-dns/pdnsd/pdnsd-1.1.10.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.19 2004/11/08 08:55:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.20 2005/07/09 15:43:27 swegener Exp $
 
 inherit eutils
 
-MY_P=${PN}-${PV}-par
+MY_P=${P}-par
 DESCRIPTION="Proxy DNS server with permanent caching"
 HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://home.t-online.de/home/Moestl"
 SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/${MY_P}.tar.gz"
@@ -23,8 +23,6 @@ DEPEND="virtual/libc
 	sys-devel/autoconf"
 RDEPEND="virtual/libc"
 
-S=${WORKDIR}/${PN}-${PV}
-
 pkg_setup() {
 	enewgroup pdnsd
 	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd