Don't install in /usr/usr #372587

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 32 insertions, 20 deletions

diff --git a/dev-tcltk/iwidgets/ChangeLog b/dev-tcltk/iwidgets/ChangeLog
index d9710159f02b..b81991e3253a 100644
--- a/dev-tcltk/iwidgets/ChangeLog
+++ b/dev-tcltk/iwidgets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/iwidgets
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/ChangeLog,v 1.21 2010/12/07 19:56:39 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/ChangeLog,v 1.22 2011/06/23 15:16:17 jlec Exp $
+
+*iwidgets-4.0.1-r3 (23 Jun 2011)
+
+  23 Jun 2011; Justin Lecher <jlec@gentoo.org> files/4.0.1-path.patch,
+  -iwidgets-4.0.1-r2.ebuild, +iwidgets-4.0.1-r3.ebuild:
+  Don't install in /usr/usr #372587
 
   07 Dec 2010; Justin Lecher <jlec@gentoo.org> +files/4.0.1-path.patch,
   iwidgets-4.0.1-r2.ebuild:
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index 44c83d6ccb6b..450c237669e0 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 4.0.1-path.patch 2296 RMD160 ba32fcf516a836ebf1c1291df9f916278dd772f2 SHA1 da3965466e066dcecab7213b8819c0c07056f26c SHA256 96eb649fca220461403f1bd9d21bbb4ad08081351d1fce2a6f5e70f1a0fdf49b
+AUX 4.0.1-path.patch 2376 RMD160 4601a24f5db5299a2c053bc8b667d32bb5565458 SHA1 6eb0867d92e98ba78b4abf776636231f2f4aa58a SHA256 496efbba07ca1e62a27129807a569d5d346e1fc68e380b3bec942404d0dd7847
 DIST itcl3.2.1_src.tgz 427026 RMD160 6a6bbc5596e3c7b8bfd6783533d26d07b1c3a7c1 SHA1 890f56e61826a9c3522fb24bf3c08f73cea8a1dd SHA256 9a225564fc94beef4cc0e627a368d9d2b4425c58b93d5a787c9836d6cceed2ad
 DIST iwidgets4.0.1.tar.gz 647960 RMD160 d680c36b10958cb9df325bdfab8a4dd57f71cac9 SHA1 e08e057ba15ba9e10cb809a935d585a57820d43c SHA256 b0e9cb74370f863e17a05df81fd70af3a39a1cfb733181c61669b30ad7799426
-EBUILD iwidgets-4.0.1-r2.ebuild 1520 RMD160 b3deef95a724a3b9d9709e3a9bc2bcae45ea2325 SHA1 454d71545e821c4d322ef68951360493b53955a5 SHA256 35c0de3e53165ebf8b91d6afad97289c11f63886861d563b0f8e2cf344dd7a61
+EBUILD iwidgets-4.0.1-r3.ebuild 1520 RMD160 c7cb1413e793129deebbdbd52ede076ce7fde3f8 SHA1 e94a70793dca5c520c62c1691652b5dd1494507a SHA256 2b133190ce25f701e5e8d70bd41597cdf18756d8cac06350052e9074c0284365
 EBUILD iwidgets-4.0.1.ebuild 956 RMD160 dcd94754a7c1f58d7ad1051b9bf188f25c3c4746 SHA1 389997995ddcc1d7eea8e146ed471c1970996af7 SHA256 1500246b92f1c87233b6196a5637566830e04dbf4f503b88b7138fc1ac1496b7
-MISC ChangeLog 2548 RMD160 eec933fd1b5bfb14d76ecbdc72fb76b1b23c4755 SHA1 6b4a75b30570fd61733f82a2aa666fa09c8001a2 SHA256 a99838c7658d0f1aedf98d7eedf11fd02c77ee546de1215f79b5c6d7e6bc8965
+MISC ChangeLog 2746 RMD160 03998733d9016a8edd01b44fa39555aef4f15aea SHA1 e80beb6dc9f329b9b8c2e68ed6aff4a7da673334 SHA256 7a73c876b3694539468d7030b840b7f4b6d40fd53650df55ed192a78a7ae4913
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkz+kcMACgkQgAnW8HDreRYojgCdGvlH6oos8zUJxyYpDkvcrVup
-Qt4An2CS0YAJTBAnnWmkRhbd5FhAj6Eq
-=IYIg
+iEYEARECAAYFAk4DWNAACgkQgAnW8HDreRZ5cwCgtQKhbAqR5FA/Dx8hwiSPBAfl
+LZIAn1TgzTBt1sQwSV6tkUmu0ardQTvD
+=EtSX
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/iwidgets/files/4.0.1-path.patch b/dev-tcltk/iwidgets/files/4.0.1-path.patch
index e9c5a825ee43..095d9ed81e1c 100644
--- a/dev-tcltk/iwidgets/files/4.0.1-path.patch
+++ b/dev-tcltk/iwidgets/files/4.0.1-path.patch
@@ -1,19 +1,25 @@
-diff --git a/Makefile.in b/Makefile.in
-index 381bfac..1ba8efb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -48,7 +48,9 @@ LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+--- iwidgets4.0.1/Makefile.in
++++ iwidgets4.0.1/Makefile.in
+@@ -30,6 +30,7 @@
+ 
+ srcdir = @srcdir@
+ bindir = @bindir@
++mandir = @mandir@
+ 
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+@@ -48,7 +49,9 @@
  BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
  
  # Top-level directory in which to install manual entries:
 -MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
-+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/usr/share/man/mann
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)/mann
 +
-+DATA_DIR = $(INSTALL_ROOT)$(prefix)/usr/share/iwidgets$(IWIDGETS_VERSION)
++DATA_DIR = $(INSTALL_ROOT)$(prefix)/share/iwidgets$(IWIDGETS_VERSION)
  
  # Directory containing Tcl source code (for library used during test):
  TCL_SRC_DIR = @TCL_SRC_DIR@
-@@ -135,26 +137,26 @@ install-libraries:
+@@ -135,26 +138,26 @@
  	    done;
  
  install-demos:
@@ -47,7 +53,7 @@ index 381bfac..1ba8efb 100644
  	    fi; \
  	    done;
  
-@@ -169,7 +171,6 @@ install-doc:
+@@ -169,7 +172,6 @@
  	        $$i > $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
  	    chmod 444 $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
  	    done;
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r2.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
index 2b0b5ee0e5d3..fc3feac2dce4 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r2.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1-r2.ebuild,v 1.4 2010/12/07 19:56:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild,v 1.1 2011/06/23 15:16:17 jlec Exp $
 
 EAPI="3"