cleanup ebuild a bit #77501

(Portage version: 2.1.1_pre4)

3 files changed, 45 insertions, 35 deletions

diff --git a/app-admin/scotty/files/digest-scotty-2.1.11 b/app-admin/scotty/files/digest-scotty-2.1.11
index 54f3016f91c2..473a5daa9539 100644
--- a/app-admin/scotty/files/digest-scotty-2.1.11
+++ b/app-admin/scotty/files/digest-scotty-2.1.11
@@ -1 +1,3 @@
 MD5 11a636f02af5ab50d22f10864fc30ef5 scotty-2.1.11.tar.gz 1381059
+RMD160 3b4d45f3db73f05b49a46017bf2ffed6d6464b00 scotty-2.1.11.tar.gz 1381059
+SHA256 85c35e192b12dee7dc7cd56207fd59b7dc9c3c563a0f2c28feef01bdaa8d8c41 scotty-2.1.11.tar.gz 1381059
diff --git a/app-admin/scotty/files/scotty-2.1.11-Makefile.patch b/app-admin/scotty/files/scotty-2.1.11-Makefile.patch
index 7f1fb6da1401..a19ba01ca70e 100644
--- a/app-admin/scotty/files/scotty-2.1.11-Makefile.patch
+++ b/app-admin/scotty/files/scotty-2.1.11-Makefile.patch
@@ -1,6 +1,6 @@
---- unix/Makefile.in	2001-06-15 10:06:35.000000000 +0000
-+++ unix/Makefile.in	2005-01-01 20:57:04.365251179 +0000
-@@ -26,34 +26,34 @@
+--- unix/Makefile.in
++++ unix/Makefile.in
+@@ -26,25 +26,25 @@
  exec_prefix =	@exec_prefix@
  
  # Directory in which to install the program scotty:
@@ -9,39 +9,46 @@
  
  # Directory in which to install dynamic loadable modules:
 -LIB_INSTALL_DIR =       $(exec_prefix)/lib
-+LIB_INSTALL_DIR =       $(DESTDIR)$(exec_prefix)/lib
++LIB_INSTALL_DIR =       $(DESTDIR)@bindir@
  
  # Directory in which dynamic loadable modules are installed:
 -LIB_RUNTIME_DIR =       $(exec_prefix)/lib
-+LIB_RUNTIME_DIR =       $(DESTDIR)$(exec_prefix)/lib
++LIB_RUNTIME_DIR =       $(DESTDIR)@libdir@
  
  # Directory in which to install library files belonging to the extension.
 -TNM_INSTALL_DIR =	$(prefix)/lib/tnm$(TNM_VERSION)
-+TNM_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tnm$(TNM_VERSION)
++TNM_INSTALL_DIR =	$(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)
  
  # Directory in which to install library files belonging to the extension.
 -TCL_INSTALL_DIR =	$(prefix)/lib/tcl$(TCL_VERSION)
-+TCL_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tcl$(TCL_VERSION)
++TCL_INSTALL_DIR =	$(LIB_RUNTIME_DIR)/tcl$(TCL_VERSION)
  
  # Directory in which to install the library of tkined scripts.
 -TKI_INSTALL_DIR =	$(prefix)/lib/tkined$(TKI_VERSION)
-+TKI_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tkined$(TKI_VERSION)
++TKI_INSTALL_DIR =	$(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)
  
  # Top-level directory for manual entries:
 -MAN_INSTALL_DIR =	$(prefix)/man
-+MAN_INSTALL_DIR =	$(DESTDIR)$(prefix)/man
++MAN_INSTALL_DIR =	$(DESTDIR)@mandir@
  
  # Directory in which to install the manual entries:
--MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
-+MAN1_INSTALL_DIR =	$(DESTDIR)$(MAN_INSTALL_DIR)/man1
- 
- # Directory in which to install manual entry for straps:
--MAN8_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man8
-+MAN8_INSTALL_DIR =	$(DESTDIR)$(MAN_INSTALL_DIR)/man8
- 
- # Directory in which to install manual entry for msqltcl, cmiptcl:
--MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
-+MANN_INSTALL_DIR =	$(DESTDIR)$(MAN_INSTALL_DIR)/mann
+ MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
+@@ -57,7 +57,7 @@
  
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
+-CFLAGS = -O
++CFLAGS = @CFLAGS@
+ 
+ # NTPING should contain the full path to the installed ntping binary.
+ NTPING = $(BIN_INSTALL_DIR)/ntping
+@@ -924,7 +924,8 @@
+ ether.x: $(TNM_GENERIC_DIR)/ether.x
+ 	cp $(TNM_GENERIC_DIR)/ether.x .
+ 
+-ether_xdr.c ether_clnt.c ether.h: ether.x
++ether_xdr.c ether_clnt.c: ether.h
++ether.h: ether.x
+ 	$(RPCGEN) ether.x
+ 
+ ether_xdr.o: ether_xdr.c
diff --git a/app-admin/scotty/scotty-2.1.11.ebuild b/app-admin/scotty/scotty-2.1.11.ebuild
index 5799168f2e8f..543745ea9e14 100644
--- a/app-admin/scotty/scotty-2.1.11.ebuild
+++ b/app-admin/scotty/scotty-2.1.11.ebuild
@@ -1,8 +1,8 @@
-# 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/app-admin/scotty/scotty-2.1.11.ebuild,v 1.11 2005/04/21 14:17:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/scotty/scotty-2.1.11.ebuild,v 1.12 2006/08/05 22:12:03 vapier Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="tcl network management extension"
 HOMEPAGE="http://wwwhome.cs.utwente.nl/~schoenw/scotty"
@@ -10,41 +10,42 @@ SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha amd64"
+KEYWORDS="alpha amd64 x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	sys-devel/flex
+DEPEND="sys-devel/flex
 	sys-devel/bison
 	dev-lang/perl
 	dev-lang/tcl
 	dev-lang/tk
 	sys-devel/autoconf"
+RDEPEND=""
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-suse.patch
-	epatch ${FILESDIR}/${P}-Makefile.patch
-
-	cd ${S}/unix ; autoconf
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-suse.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	rm -f compat/resolv.h
+	cd unix
+	eautoconf
 }
 
 src_compile() {
-	cd ${S}/unix
+	cd unix
 	econf || die
-	make "CFLAGS=${CFLAGS}" || die
+	emake || die
 }
 
 src_install() {
-	cd ${S}/unix
+	cd unix
 	dodir /usr/share/man
 #	TNM_LIBRARY=${D}/usr/lib/tnm${V} \
 #		make prefix=${D}/usr \
 #		MAN_INSTALL_DIR=${D}/usr/share/man install
 #	make prefix=${D}/usr \
 #		MAN_INSTALL_DIR=${D}/usr/share/man sinstall
-	make DESTDIR=${D} install
+	make DESTDIR="${D}" install || die
 	cd ${D}/usr/bin
 	perl -p -i -e 's|/.*/image||' ${D}/usr/lib/tnm2.1.11/pkgIndex.tcl
 	perl -p -i -e 's|/.*/image||' ${D}/usr/lib/tkined1.4.11/pkgIndex.tcl