Make the build system DESTDIR-aware to de-uglify the ebuild. Patch applied upstream. Eternal glory for a libtool patch that makes the QA warning go away.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc7-00051-g62786b9-dirty x86_64

5 files changed, 425 insertions, 29 deletions

diff --git a/net-analyzer/snips/ChangeLog b/net-analyzer/snips/ChangeLog
index fe24ab2df4ff..a2a0e9497f13 100644
--- a/net-analyzer/snips/ChangeLog
+++ b/net-analyzer/snips/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/snips
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/ChangeLog,v 1.1 2008/06/27 15:25:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/ChangeLog,v 1.2 2008/06/30 12:18:52 chainsaw Exp $
+
+*snips-1.2-r1 (30 Jun 2008)
+
+  30 Jun 2008; <chainsaw@gentoo.org>
+  +files/snips-1.2-destdir-awareness.patch,
+  -files/snips-1.2-precache-config, +files/snips-1.2-r1-precache-config,
+  -snips-1.2.ebuild, +snips-1.2-r1.ebuild:
+  Make the build system DESTDIR-aware to de-uglify the ebuild. Patch applied
+  upstream. Eternal glory for a libtool patch that makes the QA warning go
+  away.
 
 *snips-1.2 (27 Jun 2008)
 
diff --git a/net-analyzer/snips/Manifest b/net-analyzer/snips/Manifest
index 37033b6efc78..42c32691ca57 100644
--- a/net-analyzer/snips/Manifest
+++ b/net-analyzer/snips/Manifest
@@ -3,17 +3,18 @@ Hash: SHA1
 
 AUX snips-1.2-code-ordering.patch 712 RMD160 61d0f7a70b4b95abb71d6f9a4998aa4f398b2db6 SHA1 23002357d88afdd5854a97d1a7f75b46d5b638bd SHA256 b25512ea95680f3df63553568a94197b0080c8c7bf2296782668739761bd5ef5
 AUX snips-1.2-conflicting-types.patch 1618 RMD160 ed0a6b38e021126fd8db6f3e248c7942289b94bb SHA1 3ebfef705a36b3866f396ca4f173890c7998c7cc SHA256 71912412ce76cf78f1214534618a4570dfa13779c4d8b7baf4f645c7de8ab4d5
+AUX snips-1.2-destdir-awareness.patch 17093 RMD160 d45b65d3b357dfc4f70443845526834beaadb669 SHA1 2b3904e5294eb9108ce028395e490c8e233719c1 SHA256 0896484b2bf1a792cd3d5d9ed7634c29e78bd873771ca079bd31d93d9f6f1a1e
 AUX snips-1.2-implicit-declarations.patch 3913 RMD160 35525b2ff863176c91be5d839a0e33f941099aa4 SHA1 74b61f727e39535a7260fa7c439b84e2f15149ff SHA256 5eb0e41b82cd1ef943b488e8e545c99e880bda07e238d920d987211518ae8dba
 AUX snips-1.2-non-interactive.patch 3462 RMD160 82571f9b80e9a9c4297ce0b1cf2c9928128e29e6 SHA1 f4f58465e9c8d0ceedbb811609c643063c92463b SHA256 c06d66f13e95f4d4e57bb293f06fa2ff7d96631bf209d2978a97567419aec798
-AUX snips-1.2-precache-config 524 RMD160 61c5630bd029a2aef8161b0ab2adb40f4374b36c SHA1 4df5acfbb6392ec51704733dc2e612c074a0136f SHA256 abba526d321a7eadd2eb8a4064d5193bae5e0ffb3bc7a80c1fdf3a6648163f7b
+AUX snips-1.2-r1-precache-config 460 RMD160 53a93828b13f6ad4c8b38ffaa172f42dd3abc2de SHA1 dce21e21f328aed047e41b99a5dc3da8be68368f SHA256 e4772928884425cedf710d6ed01d75278d2460c91d72fbccd08c444f1bee0918
 DIST snips-1.2.tar.gz 1382731 RMD160 4ee9906558387545a0a02f8a6df7d3e119b1fc2e SHA1 3534c77a4b33aab3c9b49a8ad229d9263bb719a4 SHA256 2ca44a51251b569e9429ae404caccb3721a9697532e95c9ff0e6db9ef8e3cd28
-EBUILD snips-1.2.ebuild 1920 RMD160 352330388c88a602bab0751556aab4420e2eaf6f SHA1 5c6e79569bee75212f396d431631cffe3c172117 SHA256 5416fc3d56df14539a36038b316e80f6d63a06a8b1117c421e925ea33c6d517d
-MISC ChangeLog 534 RMD160 ae94dd3a2d4e71e921ef2eb3a9c17c9abfeb7e18 SHA1 2664ec929db4d41824b17249a7e9806de586b8d7 SHA256 5c21abb6ca4088a4e20a9a2ce0f6c8cc93bc7af1b52e5ac740298ae33f80bb8a
+EBUILD snips-1.2-r1.ebuild 1525 RMD160 d628d2a63fa9498bdfa84dadb255209ee3a2326d SHA1 485a0221cb0622af091969f1d9ec6fc2aec06123 SHA256 18987c04f986bf287bea05bc9bb2680497044ef5d0b5b4ec4fc3e97742947354
+MISC ChangeLog 921 RMD160 a2d59d3021c6ed60891da9d9df7acaf800cf3b9d SHA1 cdab2b701aaa04cfb70f9192be5c1f4023c80d69 SHA256 a4f2fbff656c9a5c1780fb9324cb5bd7da9c4978f76a1be728d1aaff0075768a
 MISC metadata.xml 229 RMD160 1addfe2dccbb5a6fb878fc690c2d3648882cbccc SHA1 18b53e1505d808f4418966964033347396b7652d SHA256 beb2126c45a8a8c781defad3afaae8986b5716c19c9d92489ac4b6e4a660e821
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhlJCgACgkQp5vW4rUFj5qcAQCcDEXEOTPrLPkvEoQzNf7lUU+k
-iXUAn3lR9cXTS9ZnbZmPt728D39ap7gk
-=cQ6T
+iEYEARECAAYFAkhozvAACgkQp5vW4rUFj5o9AQCgkdFC2qkTDTIM11vbgTZPy90N
+zuMAoLRhHYrP1um4B+90H/dBHwpTTC1+
+=+7Qa
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch b/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch
new file mode 100644
index 000000000000..c842f27c52b2
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch
@@ -0,0 +1,402 @@
+diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid
+--- snips-1.2.ORIG/etherload/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/etherload/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -25,10 +25,10 @@
+ 	make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG)
+ 
+ install: $(TARG)
+-	$(INSTALL) -c -m 4750 $(TARG) $(BINDIR)
++	$(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)
+ 	@if [ `whoami` = "root" ]; then \
+-		chown root $(BINDIR)/$(TARG) ;\
+-		ls -lg $(BINDIR)/$(TARG) ;\
++		chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\
++		ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\
+ 	else \
+ 		echo "";echo "___Installed $(TARG) needs to be root suid___" ;\
+ 		echo "Do as root manually" ;\
+diff -uNr snips-1.2.ORIG/Makefile.mid snips-1.2/Makefile.mid
+--- snips-1.2.ORIG/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -66,8 +66,8 @@
+ 
+ ## Ultrix make balked at the tests for directories, hence the second test
+ install:	installdir  lib
+-	@[ -d $(ROOTDIR) ] && [ -d $(DATADIR) ] && [ -d $(ETCDIR) ] \
+-		&& [ -d $(BINDIR) ]
++	@[ -d $(DESTDIR)$(ROOTDIR) ] && [ -d $(DESTDIR)$(DATADIR) ] && \
++		[ -d $(DESTDIR)$(ETCDIR) ] && [ -d $(DESTDIR)$(BINDIR) ]
+ 	@-(touch SniPpet ; $(INSTALL) -c -m 750 SniPpet /tmp/;) >/dev/null 2>&1 ;
+ 	@(if [ -f /tmp/SniPpet ]; then rm -f SniPpet /tmp/SniPpet; else \
+ 	  echo "YOU HAVE AN INCOMPATIBLE install, use 'myinstall' instead" ;\
+@@ -82,10 +82,10 @@
+ 	@echo ""
+ 	@echo "Installing sample config files under $(EXAMPLESDIR)/..."
+ 	@-for i in */*-confg */*.conf *.conf ; do \
+-		$(INSTALL) -m 444 -c  $$i $(EXAMPLESDIR)/ ;\
++		$(INSTALL) -m 444 -c  $$i $(DESTDIR)$(EXAMPLESDIR)/ ;\
+ 	done
+ 	@if [ ! -f $(ETCDIR)/snips.conf ]; then \
+-		$(INSTALL) -c -m 755 snips.conf $(ETCDIR)/snips.conf ;\
++		$(INSTALL) -c -m 755 snips.conf $(DESTDIR)$(ETCDIR)/snips.conf ;\
+ 	 fi
+ 	@echo "" ; echo "           NOW su AND DO A make root "
+ 
+@@ -95,9 +95,9 @@
+ 	@if [ "`$(WHOAMI)`" = "root" ]; then \
+ 		echo "Installing the following programs SUID under $(BINDIR)";\
+ 		echo "  multiping  etherload  trapmon" ;\
+-		$(INSTALL) -m 4711 -c pingmon/multiping/multiping $(BINDIR) ;\
+-		$(INSTALL) -m 4710 -c etherload/etherload $(BINDIR) ;\
+-		$(INSTALL) -m 4710 -c trapmon/trapmon $(BINDIR) ;\
++		$(INSTALL) -m 4711 -c pingmon/multiping/multiping $(DESTDIR)$(BINDIR) ;\
++		$(INSTALL) -m 4710 -c etherload/etherload $(DESTDIR)$(BINDIR) ;\
++		$(INSTALL) -m 4710 -c trapmon/trapmon $(DESTDIR)$(BINDIR) ;\
+ 	 else \
+ 		echo "PLEASE RUN  make root  AS root (currently `whoami`)" ;\
+ 	 fi
+diff -uNr snips-1.2.ORIG/Makefile.tail snips-1.2/Makefile.tail
+--- snips-1.2.ORIG/Makefile.tail	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/Makefile.tail	2008-06-30 12:35:38.000000000 +0100
+@@ -9,32 +9,32 @@
+ 
+ ## these dirs are listed in Makefile.head
+ installdir:
+-	@[ -d $(ROOTDIR) ] || mkdir  $(ROOTDIR)
+-	@[ -d $(BINDIR) ] ||  mkdir $(BINDIR)
+-	@[ -d $(DATADIR) ] || mkdir $(DATADIR)
+-	@[ -d $(ETCDIR) ] ||  mkdir $(ETCDIR)
+-	@[ -d $(PIDDIR) ] ||  mkdir $(PIDDIR)
+-	@[ -d $(INITDIR) ] || mkdir $(INITDIR)
+-	@[ -d $(MSGSDIR) ] || mkdir $(MSGSDIR)
+-	@[ -d $(RRD_DBDIR) ] || mkdir $(RRD_DBDIR)
+-	@[ -d $(EXAMPLESDIR) ] || mkdir $(EXAMPLESDIR)
+-	@[ -d $(DEVICEHELPDIR) ] || mkdir $(DEVICEHELPDIR)
+-	@[ -d $(CGIDIR) ] || mkdir -p $(CGIDIR)
+-	@[ -d $(HTMLDIR) ] || mkdir -p $(HTMLDIR)
+-	@[ -d $(ROOTDIR)/logs ] || mkdir $(ROOTDIR)/logs
++	@[ -d $(DESTDIR)$(ROOTDIR) ] || mkdir -p $(DESTDIR)$(ROOTDIR)
++	@[ -d $(DESTDIR)$(BINDIR) ] ||  mkdir -p $(DESTDIR)$(BINDIR)
++	@[ -d $(DESTDIR)$(DATADIR) ] || mkdir -p $(DESTDIR)$(DATADIR)
++	@[ -d $(DESTDIR)$(ETCDIR) ] ||  mkdir -p $(DESTDIR)$(ETCDIR)
++	@[ -d $(DESTDIR)$(PIDDIR) ] ||  mkdir -p $(DESTDIR)$(PIDDIR)
++	@[ -d $(DESTDIR)$(INITDIR) ] || mkdir -p $(DESTDIR)$(INITDIR)
++	@[ -d $(DESTDIR)$(MSGSDIR) ] || mkdir -p $(DESTDIR)$(MSGSDIR)
++	@[ -d $(DESTDIR)$(RRD_DBDIR) ] || mkdir -p $(DESTDIR)$(RRD_DBDIR)
++	@[ -d $(DESTDIR)$(EXAMPLESDIR) ] || mkdir -p $(DESTDIR)$(EXAMPLESDIR)
++	@[ -d $(DESTDIR)$(DEVICEHELPDIR) ] || mkdir -p $(DESTDIR)$(DEVICEHELPDIR)
++	@[ -d $(DESTDIR)$(CGIDIR) ] || mkdir -p $(DESTDIR)$(CGIDIR)
++	@[ -d $(DESTDIR)$(HTMLDIR) ] || mkdir -p $(DESTDIR)$(HTMLDIR)
++	@[ -d $(DESTDIR)$(ROOTDIR)/logs ] || mkdir -p $(DESTDIR)$(ROOTDIR)/logs
+ 
+ init:
+-	@if [ ! -z "$(INITFILES)" ] && [ -d "$(INITDIR)" ]; then \
++	@if [ ! -z "$(INITFILES)" ] && [ -d "$(DESTDIR)$(INITDIR)" ]; then \
+ 	 for i in $(INITFILES) x ; \
+ 	  do \
+ 	   if [ "$$i" = "x" ]; then \
+ 		: ;\
+ 	   else \
+-		if [ -f "$(INITDIR)/$$i.init" ]; then \
++		if [ -f "$(DESTDIR)$(INITDIR)/$$i.init" ]; then \
+ 			echo "Not overwriting existing $(INITDIR)/$$i.init";\
+ 		else \
+ 			echo "Installing $$i.init under $(INITDIR)/" ;\
+-			ln -s $(BINDIR)/snipsprog.init $(INITDIR)/$$i.init ;\
++			ln -s $(DESTDIR)$(BINDIR)/snipsprog.init $(DESTDIR)$(INITDIR)/$$i.init ;\
+ 		fi \
+ 	   fi \
+ 	 done \
+diff -uNr snips-1.2.ORIG/man/Makefile.mid snips-1.2/man/Makefile.mid
+--- snips-1.2.ORIG/man/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/man/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -26,18 +26,18 @@
+ 
+ install:  installdir
+ 	@echo "Installing in 'man'"
+-	@- [ -d $(MANDIR) ] || mkdir $(MANDIR)
++	@- [ -d $(DESTDIR)$(MANDIR) ] || mkdir $(DESTDIR)$(MANDIR)
+ #	@-for d in $(MANDIR)/man1 $(MANDIR)/man3 $(MANDIR)/man8; do \
+ #		[! -d $$d ]  && mkdir $$d ;\
+ #	 done
+ 	@- for m in $(MANPAGES1); do \
+-	 	$(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 1`$(MANEXT) ;\
++	 	$(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 1`$(MANEXT) ;\
+ 	 done
+ 	@- for m in $(MANPAGES3); do \
+-	 	$(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 3`$(MANEXT) ;\
++	 	$(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 3`$(MANEXT) ;\
+ 	 done
+ 	@- for m in $(MANPAGES8); do \
+-	 	$(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 8`$(MANEXT) ;\
++	 	$(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 8`$(MANEXT) ;\
+ 	 done
+ 
+ clean:
+diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid
+--- snips-1.2.ORIG/nsmon/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/nsmon/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -17,7 +17,7 @@
+ 	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install: installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 
+ ## for standalone, need to link with -lresolv or -lbind
+ nstest: nsmon.c
+diff -uNr snips-1.2.ORIG/ntpmon/Makefile.mid snips-1.2/ntpmon/Makefile.mid
+--- snips-1.2.ORIG/ntpmon/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/ntpmon/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ 
+ install: installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 
+ clean:
+ 	rm -f $(DIRT)
+diff -uNr snips-1.2.ORIG/perl-monitors/Makefile.mid snips-1.2/perl-monitors/Makefile.mid
+--- snips-1.2.ORIG/perl-monitors/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/perl-monitors/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -62,32 +62,32 @@
+ # ideally hostmon-osclients/ need not go into the BINDIR, but we are
+ # putting it all there for now.
+ install:
+-	-@[ -d $(BINDIR)/hostmon-osclients ] || mkdir $(BINDIR)/hostmon-osclients
++	-@[ -d $(DESTDIR)$(BINDIR)/hostmon-osclients ] || mkdir $(DESTDIR)$(BINDIR)/hostmon-osclients
+ 	-@echo "Installing files in $(BINDIR)/hostmon-osclients" ;\
+ 	  for f in hostmon-osclients/* ; do \
+ 	   if [ -f $$f ]; then \
+-	     $(INSTALL) -c -m 755 $$f $(BINDIR)/hostmon-osclients/ ;\
++	     $(INSTALL) -c -m 755 $$f $(DESTDIR)$(BINDIR)/hostmon-osclients/ ;\
+ 	   fi \
+ 	  done
+-	-@cd $(BINDIR)/hostmon-osclients ; \
++	-@cd $(DESTDIR)$(BINDIR)/hostmon-osclients ; \
+ 	  if [ -f hostmon-client.seds ]; then \
+ 		$(INSTALL) -c -m 755 hostmon-client.seds  hostmon-client ;\
+ 		rm -f hostmon-client.seds ;\
+ 	  fi
+ 	-@echo "Installing perl monitors under $(BINDIR)" ;\
+ 	  for f in $(PROGS) ; do \
+-	    $(INSTALL) -c -m 755 $$f.seds $(BINDIR)/$$f ;\
++	    $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\
+ 	  done
+ 	-@for f in $(CONF) ; do \
+-	   if [ ! -f $(ETCDIR)/$$f ]; then \
+-		$(INSTALL) -c -m 644 $$f.seds $(ETCDIR)/$$f ;\
++	   if [ ! -f $(DESTDIR)$(ETCDIR)/$$f ]; then \
++		$(INSTALL) -c -m 644 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ;\
+ 	   fi \
+ 	 done
+-	$(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(BINDIR)/
+-	$(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget  $(BINDIR)/
+-	$(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(ETCDIR)/
+-	@if [ -f $(ETCDIR)/mibII.txt ]; then \
+-		mv $(ETCDIR)/mibII.txt $(ETCDIR)/mibII.txt.old ;\
++	$(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(DESTDIR)$(BINDIR)/
++	$(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget  $(DESTDIR)$(BINDIR)/
++	$(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(DESTDIR)$(ETCDIR)/
++	@if [ -f $(DESTDIR)$(ETCDIR)/mibII.txt ]; then \
++		mv $(DESTDIR)$(ETCDIR)/mibII.txt $(DESTDIR)$(ETCDIR)/mibII.txt.old ;\
+ 	 fi 
+ 	@echo  "See $(SRCDIR)/perl-monotors/README for further customizations"
+ 
+diff -uNr snips-1.2.ORIG/pingmon/Makefile.mid snips-1.2/pingmon/Makefile.mid
+--- snips-1.2.ORIG/pingmon/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/pingmon/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -26,11 +26,11 @@
+ 	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install: installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ ;
+-	@[ -f $(BINDIR)/ippingmon ] && rm -f $(BINDIR)/ippingmon ; \
+-	 ln -s $(BINDIR)/$(TARG) $(BINDIR)/ippingmon ;\
+-	 [ -f $(BINDIR)/rpcpingmon ] && rm -f $(BINDIR)/rpcpingmon ; \
+-	 ln -s $(BINDIR)/$(TARG) $(BINDIR)/rpcpingmon
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ ;
++	@[ -f $(DESTDIR)$(BINDIR)/ippingmon ] && rm -f $(DESTDIR)$(BINDIR)/ippingmon ; \
++	 ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/ippingmon ;\
++	 [ -f $(DESTDIR)$(BINDIR)/rpcpingmon ] && rm -f $(DESTDIR)$(BINDIR)/rpcpingmon ; \
++	 ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/rpcpingmon
+ 
+ clean:
+ 	rm -f $(DIRT)
+diff -uNr snips-1.2.ORIG/pingmon/multiping/Makefile.mid snips-1.2/pingmon/multiping/Makefile.mid
+--- snips-1.2.ORIG/pingmon/multiping/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/pingmon/multiping/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -14,10 +14,10 @@
+ 	$(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG)
+ 
+ install:  installdir  $(TARG)
+-	$(INSTALL) -c -m 4711 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 4711 $(TARG) $(DESTDIR)$(BINDIR)/
+ 	@if [ `whoami` = "root" ]; then \
+-		chown root $(BINDIR)/$(TARG) ;\
+-		ls -lg $(BINDIR)/$(TARG) ;\
++		chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\
++		ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\
+ 	 else \
+ 		echo "";echo "___Installed $(TARG) needs to be root suid___" ;\
+ 		echo "Do as root manually" ;\
+diff -uNr snips-1.2.ORIG/pingmon/rpcping/Makefile.mid snips-1.2/pingmon/rpcping/Makefile.mid
+--- snips-1.2.ORIG/pingmon/rpcping/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/pingmon/rpcping/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -16,7 +16,7 @@
+ 	$(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG)
+ 
+ install:  installdir  $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 
+ clean:
+ 	rm -f $(DIRT) $(TARG)
+diff -uNr snips-1.2.ORIG/portmon/Makefile.mid snips-1.2/portmon/Makefile.mid
+--- snips-1.2.ORIG/portmon/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/portmon/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -15,7 +15,7 @@
+ 
+ #
+ install:  installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG)  $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 
+ clean:
+ 	rm -f $(DIRT)
+diff -uNr snips-1.2.ORIG/radiusmon/Makefile.mid snips-1.2/radiusmon/Makefile.mid
+--- snips-1.2.ORIG/radiusmon/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/radiusmon/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ 
+ install: installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 
+ test:	radiusmon.c md5.c
+ 	$(CC) -c $(CFLAGS) -DDEBUG -DTEST radiusmon.c
+diff -uNr snips-1.2.ORIG/snipslog/Makefile.mid snips-1.2/snipslog/Makefile.mid
+--- snips-1.2.ORIG/snipslog/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/snipslog/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -21,7 +21,7 @@
+ 	$(CC) $(CFLAGS) -DTEST -o snipslogtest snipslogtest.c  $(LIBS)
+ 
+ install:  installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG)  $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 	@echo "___Update config file for logging daemon in $(ETCDIR) ___"
+ 
+ clean:
+diff -uNr snips-1.2.ORIG/snipstv/Makefile.mid snips-1.2/snipstv/Makefile.mid
+--- snips-1.2.ORIG/snipstv/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/snipstv/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -20,9 +20,9 @@
+ 	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install:   installdir  $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)
+-	[ -r $(BINDIR)/netconsole ] || ln -s $(BINDIR)/$(TARG) $(BINDIR)/netconsole
+-	$(INSTALL) -c -m 0444 snipstv-help $(ETCDIR)
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)
++	[ -r $(DESTDIR)$(BINDIR)/netconsole ] || ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/netconsole
++	$(INSTALL) -c -m 0444 snipstv-help $(DESTDIR)$(ETCDIR)
+ 
+ clean:
+ 	rm -f $(DIRT) filter
+diff -uNr snips-1.2.ORIG/snipsweb/Makefile.mid snips-1.2/snipsweb/Makefile.mid
+--- snips-1.2.ORIG/snipsweb/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/snipsweb/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -32,24 +32,24 @@
+ 
+ install:	installdir
+ 	@for f in $(CGI) ; do \
+-		$(INSTALL) -c -m 755 $$f.seds $(CGIDIR)/$$f ; \
++		$(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(CGIDIR)/$$f ; \
+ 	done
+ 	@for f in $(CONFIG) ; do \
+-	 if [ -f $(ETCDIR)/$$f ]; then \
++	 if [ -f $(DESTDIR)$(ETCDIR)/$$f ]; then \
+ 		echo "Not overwriting existing $(ETCDIR)/$$f" ;\
+ 	 else \
+-		$(INSTALL) -c -m 755 $$f.seds $(ETCDIR)/$$f ; \
++		$(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ; \
+ 	 fi ;\
+ 	done
+-	@[ -f $(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DEVICEHELPDIR)/
++	@[ -f $(DESTDIR)$(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DESTDIR)$(DEVICEHELPDIR)/
+ 	@for f in $(HTMLFILES) ; do \
+-	 if [ -f $(HTMLDIR)/$$f ]; then \
++	 if [ -f $(DESTDIR)$(HTMLDIR)/$$f ]; then \
+ 		echo "Not overwriting existing $(HTMLDIR)/$$f" ;\
+ 	 else \
+-		$(INSTALL) -c -m 644 $$f $(HTMLDIR)/$$f ; \
++		$(INSTALL) -c -m 644 $$f $(DESTDIR)$(HTMLDIR)/$$f ; \
+ 	 fi ;\
+ 	done ;\
+-	cp -r gifs $(HTMLDIR)/gifs
++	cp -r gifs $(DESTDIR)$(HTMLDIR)/gifs
+ 	@echo  "Installed basic web files under " ; \
+ 	 echo  "   $(HTMLDIR) and $(CGIDIR)" ; \
+ 	 echo  "Move into desired web location."; \
+diff -uNr snips-1.2.ORIG/tksnips/Makefile.mid snips-1.2/tksnips/Makefile.mid
+--- snips-1.2.ORIG/tksnips/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/tksnips/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -23,7 +23,7 @@
+ 	 cat tkSnips.tix > tkSnips ;
+ 
+ install: installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 
+ clean:
+ 	rm -f $(DIRT) test
+diff -uNr snips-1.2.ORIG/tpmon/Makefile.mid snips-1.2/tpmon/Makefile.mid
+--- snips-1.2.ORIG/tpmon/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/tpmon/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -20,7 +20,7 @@
+ 	$(CC) $(CFLAGS) -o tptest tpmon.o tptest.o
+ 
+ install: installdir $(TARG)
+-	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/
+ 
+ clean:
+ 	rm -f $(DIRT) tptest
+diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid
+--- snips-1.2.ORIG/trapmon/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/trapmon/Makefile.mid	2008-06-30 12:35:38.000000000 +0100
+@@ -20,10 +20,10 @@
+ 	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install: $(TARG)
+-	$(INSTALL) -c -m 4750 $(TARG) $(BINDIR)/
++	$(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/
+ 	@if [ `whoami` = "root" ]; then \
+-		chown root $(BINDIR)/$(TARG) ;\
+-		ls -lg $(BINDIR)/$(TARG) ;\
++		chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\
++		ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\
+ 	 else \
+ 		echo "";echo "___Installed $(TARG) needs to be root suid___" ;\
+ 		echo "Do as root manually" ;\
+diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid
+--- snips-1.2.ORIG/utility/Makefile.mid	2008-06-30 12:42:43.000000000 +0100
++++ snips-1.2/utility/Makefile.mid	2008-06-30 12:42:59.000000000 +0100
+@@ -59,12 +59,12 @@
+ 	echo ""
+ 
+ install: all
+-	$(INSTALL) -c  -m 751 $(CPROGS) $(BINDIR)/
++	$(INSTALL) -c  -m 751 $(CPROGS) $(DESTDIR)$(BINDIR)/
+ 	-@ for f in $(SCRIPTS) ; do \
+-	   if [ -f $(BINDIR)/$$f ]; then \
++	   if [ -f $(DESTDIR)$(BINDIR)/$$f ]; then \
+ 	   	echo "Not overwriting existing $(BINDIR)/$$f" ;\
+ 	   else \
+-	   	$(INSTALL) -c -m 751 $$f.seds $(BINDIR)/$$f ;\
++	   	$(INSTALL) -c -m 751 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\
+ 	   fi ;\
+ 	done
+ 
diff --git a/net-analyzer/snips/files/snips-1.2-precache-config b/net-analyzer/snips/files/snips-1.2-r1-precache-config
index 24b63fb35275..a5b695426c51 100644
--- a/net-analyzer/snips/files/snips-1.2-precache-config
+++ b/net-analyzer/snips/files/snips-1.2-r1-precache-config
@@ -1,7 +1,6 @@
 # These answers are interdependent; do not edit this file!
 package="snips"
 ROOTDIR="/usr/snips"
-SRCDIR="/var/tmp/portage/net-analyzer/snips-1.2/work/snips-1.2"
 MANDIR="/usr/share/man/snips"
 MANEXT="n"
 OPSMAIL="root@localhost"
diff --git a/net-analyzer/snips/snips-1.2.ebuild b/net-analyzer/snips/snips-1.2-r1.ebuild
index 18899dd3e7f5..5c9c520fda41 100644
--- a/net-analyzer/snips/snips-1.2.ebuild
+++ b/net-analyzer/snips/snips-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/snips-1.2.ebuild,v 1.2 2008/06/27 17:33:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/snips-1.2-r1.ebuild,v 1.1 2008/06/30 12:18:52 chainsaw Exp $
 
 inherit eutils toolchain-funcs
 
@@ -23,14 +23,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Gentoo-specific non-interactive configure override
-	cp "${FILESDIR}/${P}-precache-config" "${S}/Config.cache"
+	cp "${FILESDIR}/${PF}-precache-config" "${S}/Config.cache"
 	echo "CFLAGS=\"${CFLAGS} -fPIC\"" >> "${S}/Config.cache"
 	echo "CC=\"$(tc-getCC)\"" >> "${S}/Config.cache"
+	echo "SRCDIR=\"${S}\"" >> "${S}/Config.cache"
 	epatch "${FILESDIR}/${P}-non-interactive.patch"
 	# Applied to upstream CVS
 	epatch "${FILESDIR}/${P}-implicit-declarations.patch"
 	epatch "${FILESDIR}/${P}-conflicting-types.patch"
 	epatch "${FILESDIR}/${P}-code-ordering.patch"
+	epatch "${FILESDIR}/${P}-destdir-awareness.patch"
 }
 
 src_compile() {
@@ -42,23 +44,5 @@ src_compile() {
 }
 
 src_install() {
-	mkdir "${D}/usr"
-
-	emake \
-		DESTDIR="${D}" \
-		ROOTDIR="${D}/usr/snips" \
-		DATADIR="${D}/usr/snips/data" \
-		ETCDIR="${D}/usr/snips/etc" \
-		BINDIR="${D}/usr/snips/bin" \
-		PIDDIR="${D}/usr/snips/run" \
-		INITDIR="${D}/usr/snips/init.d" \
-		MSGSDIR="${D}/usr/snips/msgs" \
-		RRD_DBDIR="${D}/usr/snips/rrddata" \
-		EXAMPLESDIR="${D}/usr/snips/etc/samples" \
-		DEVICEHELPDIR="${D}/usr/snips/device-help" \
-		CGIDIR="${D}/usr/snips/web/cgi" \
-		HTMLDIR="${D}/usr/snips/web/html" \
-		MANDIR="${D}/usr/snips/man" \
-		install \
-		|| die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 }