QA: Don't assign default to S

(Portage version: 2.0.51.22-r1)

5 files changed, 13 insertions, 39 deletions

diff --git a/www-misc/bookmarksync/bookmarksync-0.3.1.ebuild b/www-misc/bookmarksync/bookmarksync-0.3.1.ebuild
index 6efe1d74e342..986435929c29 100644
--- a/www-misc/bookmarksync/bookmarksync-0.3.1.ebuild
+++ b/www-misc/bookmarksync/bookmarksync-0.3.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.1.ebuild,v 1.1 2004/08/15 18:03:24 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.1.ebuild,v 1.2 2005/07/10 01:21:02 swegener Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="bookmarksync synchronizes various browser bookmark files"
 SRC_URI="mirror://sourceforge/booksync/${P}.tar.gz"
 RESTRICT="nomirror"
@@ -14,13 +13,6 @@ SLOT="0"
 KEYWORDS="x86"
 DEPEND="virtual/libc"
 
-
-src_compile() {
-	emake || die
-}
-
 src_install () {
-	exeinto /usr/bin
-	doexe bookmarksync
+	dobin bookmarksync
 }
-
diff --git a/www-misc/bookmarksync/bookmarksync-0.3.2.ebuild b/www-misc/bookmarksync/bookmarksync-0.3.2.ebuild
index c98febb9aaf0..3b810156073c 100644
--- a/www-misc/bookmarksync/bookmarksync-0.3.2.ebuild
+++ b/www-misc/bookmarksync/bookmarksync-0.3.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.2.ebuild,v 1.1 2004/08/15 18:03:24 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.2.ebuild,v 1.2 2005/07/10 01:21:02 swegener Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="bookmarksync synchronizes various browser bookmark files"
 SRC_URI="mirror://sourceforge/booksync/${P}.tar.gz"
 RESTRICT="nomirror"
@@ -14,13 +13,6 @@ SLOT="0"
 KEYWORDS="~x86"
 DEPEND="virtual/libc"
 
-
-src_compile() {
-	emake || die
-}
-
 src_install () {
-	exeinto /usr/bin
-	doexe bookmarksync
+	dobin bookmarksync
 }
-
diff --git a/www-misc/bookmarksync/bookmarksync-0.3.3.ebuild b/www-misc/bookmarksync/bookmarksync-0.3.3.ebuild
index 01c1d96970be..57e054ba56ed 100644
--- a/www-misc/bookmarksync/bookmarksync-0.3.3.ebuild
+++ b/www-misc/bookmarksync/bookmarksync-0.3.3.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/www-misc/bookmarksync/bookmarksync-0.3.3.ebuild,v 1.1 2004/08/15 18:03:24 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.3.ebuild,v 1.2 2005/07/10 01:21:02 swegener Exp $
 
 DESCRIPTION="bookmarksync synchronizes various browser bookmark files"
 HOMEPAGE="http://sourceforge.net/projects/booksync/"
@@ -17,13 +17,8 @@ DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	perl? ( dev-lang/perl )"
 
-src_compile() {
-	emake || die
-}
-
 src_install () {
-	exeinto /usr/bin
-	doexe bookmarksync
+	dobin bookmarksync
 	if use perl >/dev/null; then
 		doexe tools/bookmarksync.pl
 		dodoc README.tools
diff --git a/www-misc/bookmarksync/bookmarksync-0.3.4.ebuild b/www-misc/bookmarksync/bookmarksync-0.3.4.ebuild
index 25a212c6932a..bd02b7e9b200 100644
--- a/www-misc/bookmarksync/bookmarksync-0.3.4.ebuild
+++ b/www-misc/bookmarksync/bookmarksync-0.3.4.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/www-misc/bookmarksync/bookmarksync-0.3.4.ebuild,v 1.2 2004/09/03 16:15:13 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.4.ebuild,v 1.3 2005/07/10 01:21:02 swegener Exp $
 
 DESCRIPTION="bookmarksync synchronizes various browser bookmark files"
 HOMEPAGE="http://sourceforge.net/projects/booksync/"
@@ -17,13 +17,8 @@ DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	perl? ( dev-lang/perl )"
 
-src_compile() {
-	emake || die
-}
-
 src_install () {
-	exeinto /usr/bin
-	doexe bookmarksync
+	dobin bookmarksync
 	if use perl >/dev/null; then
 		doexe tools/bookmarksync.pl
 		dodoc README.tools
diff --git a/www-misc/multisort/multisort-1.1.ebuild b/www-misc/multisort/multisort-1.1.ebuild
index 7cad5fa3e525..0da012ff1f70 100644
--- a/www-misc/multisort/multisort-1.1.ebuild
+++ b/www-misc/multisort/multisort-1.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/multisort/multisort-1.1.ebuild,v 1.1 2005/01/22 09:06:35 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/multisort/multisort-1.1.ebuild,v 1.2 2005/07/10 01:23:03 swegener Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="multisort takes any number of httpd logfiles in the Common Log Format and merges them together"
 HOMEPAGE="http://www.xach.com/multisort/"
@@ -13,12 +15,10 @@ IUSE=""
 
 DEPEND=""
 
-S=${WORKDIR}/${P}
-
 src_compile() {
-		make || die "make failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-		dosbin ${S}/multisort
+	dosbin ${S}/multisort
 }