projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ab2e8f9)
cleanup ebuild a bit #77501
authorMike Frysinger <vapier@gentoo.org>
Sat, 5 Aug 2006 22:12:03 +0000 (22:12 +0000)
committerMike Frysinger <vapier@gentoo.org>
Sat, 5 Aug 2006 22:12:03 +0000 (22:12 +0000)
Package-Manager: portage-2.1.1_pre4

app-admin/scotty/Manifest patch | blob | history
app-admin/scotty/files/digest-scotty-2.1.11 patch | blob | history
app-admin/scotty/files/scotty-2.1.11-Makefile.patch patch | blob | history
app-admin/scotty/scotty-2.1.11.ebuild patch | blob | history

diff --git a/app-admin/scotty/Manifest b/app-admin/scotty/Manifest
index d225e834b4645b506a742f5c2cca97cec9ef6f5b..8b2528ce3c4da4f3f8c5c845e10e98fe56e06671 100644 (file)
--- a/app-admin/scotty/Manifest
+++ b/app-admin/scotty/Manifest
@@ -1,6 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX scotty-2.1.11-Makefile.patch 1796 RMD160 9336ee6010d4efb734e1c78b2fb8ea6c9af6c34f SHA1 9166eaba835ae04a4dd2df87129d7e138c381d15 SHA256 85ac11175f2683c48f184b1249c9843b7c6a51f29a880bbd82416dbe52909641
+MD5 3325884cfef7d39e18ae28af93fe1d85 files/scotty-2.1.11-Makefile.patch 1796
+RMD160 9336ee6010d4efb734e1c78b2fb8ea6c9af6c34f files/scotty-2.1.11-Makefile.patch 1796
+SHA256 85ac11175f2683c48f184b1249c9843b7c6a51f29a880bbd82416dbe52909641 files/scotty-2.1.11-Makefile.patch 1796
+AUX scotty-2.1.11-suse.patch 1392 RMD160 4a808a28158f85c05a6ff75cd23031f387273ae1 SHA1 d6fe8e5853d872a8ba4bc6b71f0bb21fd1161379 SHA256 ae4b17a57316b0706de374f7794ac039a56844407a11f45bdce5a3cee9781902
+MD5 bd297ad6fa62c6121eec4359dea16f5d files/scotty-2.1.11-suse.patch 1392
+RMD160 4a808a28158f85c05a6ff75cd23031f387273ae1 files/scotty-2.1.11-suse.patch 1392
+SHA256 ae4b17a57316b0706de374f7794ac039a56844407a11f45bdce5a3cee9781902 files/scotty-2.1.11-suse.patch 1392
+DIST scotty-2.1.11.tar.gz 1381059 RMD160 3b4d45f3db73f05b49a46017bf2ffed6d6464b00 SHA1 819011f908c57e4591d6f50e51677c01eb55dc13 SHA256 85c35e192b12dee7dc7cd56207fd59b7dc9c3c563a0f2c28feef01bdaa8d8c41
+EBUILD scotty-2.1.11.ebuild 1522 RMD160 354d15065b038929dbc48edb1a606fac6941bcd4 SHA1 f0ce44c3a8c27157430e2b772379cbaed06c162d SHA256 bc9de8dd8080887386327d1bc74bd1a0926d18d45fdc390122b4da1ed75b0b55
+MD5 0dcdd92e121635614fbe18460cd3bbaa scotty-2.1.11.ebuild 1522
+RMD160 354d15065b038929dbc48edb1a606fac6941bcd4 scotty-2.1.11.ebuild 1522
+SHA256 bc9de8dd8080887386327d1bc74bd1a0926d18d45fdc390122b4da1ed75b0b55 scotty-2.1.11.ebuild 1522
+MISC ChangeLog 956 RMD160 2f0668803293a5d6174640e54dda3d4f86f53345 SHA1 c8531467ebbe7fc5df0261eb22d5a25a8756d0c6 SHA256 2c91ee5791b9499ce3b2254bbed3044aa1b1f13782d25f494f6321d4137dab96
 MD5 9420cc1a7f032d36d8f7f53201d48629 ChangeLog 956
+RMD160 2f0668803293a5d6174640e54dda3d4f86f53345 ChangeLog 956
+SHA256 2c91ee5791b9499ce3b2254bbed3044aa1b1f13782d25f494f6321d4137dab96 ChangeLog 956
+MISC metadata.xml 310 RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 SHA1 bdd3f2bc135db7a1475e69cf818c6644a6146d3f SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 87570d54ae73eecbff0063d69d4fd4d3 scotty-2.1.11.ebuild 1512
-MD5 65153a5ddbadbafaa1814c82f5c2d563 files/digest-scotty-2.1.11 66
-MD5 5e31a17e51acbdffe1180406519de4b1 files/scotty-2.1.11-Makefile.patch 1892
-MD5 bd297ad6fa62c6121eec4359dea16f5d files/scotty-2.1.11-suse.patch 1392
+RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310
+SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata.xml 310
+MD5 8c240be878b4feaa9a315dfa782603be files/digest-scotty-2.1.11 244
+RMD160 44aa93cd3282ba279aa8eaabe43ffa46d6915eba files/digest-scotty-2.1.11 244
+SHA256 54db03b5df81a300d9cd537e3c7e6a1397165505faef36cc7d73ee5cea6a777c files/digest-scotty-2.1.11 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE1RfGamhnQswr0vIRAiiFAJsGLeeBbuNr734kIOUZwZyqjZR5wACgjuvD
+f9/HW3OMUK68mxtivboEETI=
+=tRfS
+-----END PGP SIGNATURE-----
diff --git a/app-admin/scotty/files/digest-scotty-2.1.11 b/app-admin/scotty/files/digest-scotty-2.1.11
index 54f3016f91c2c809b3c7cc80c60b1881710adcb3..473a5daa95397997c6254e73e83168779ce4885d 100644 (file)
--- 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 7f1fb6da1401347d1d8a5e79d6fbd5379c84b2ba..a19ba01ca70eb15a9e6ecaa192b6a48fd9de663e 100644 (file)
--- 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 5799168f2e8f0af84d6f3b2abb18c697b940d201..543745ea9e14895494915c95c79fd8bb6540ddf3 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.