Keep LFS layout, #295836

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

4 files changed, 80 insertions, 16 deletions

diff --git a/dev-tcltk/iwidgets/ChangeLog b/dev-tcltk/iwidgets/ChangeLog
index 7f4d18e2202f..d9710159f02b 100644
--- a/dev-tcltk/iwidgets/ChangeLog
+++ b/dev-tcltk/iwidgets/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2010/04/07 22:40:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/ChangeLog,v 1.21 2010/12/07 19:56:39 jlec Exp $
+
+  07 Dec 2010; Justin Lecher <jlec@gentoo.org> +files/4.0.1-path.patch,
+  iwidgets-4.0.1-r2.ebuild:
+  Keep LFS layout, #295836
 
   07 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   iwidgets-4.0.1-r2.ebuild:
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index d035d5b1418c..d0c3da38c05a 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 4.0.1-path.patch 2296 RMD160 ba32fcf516a836ebf1c1291df9f916278dd772f2 SHA1 da3965466e066dcecab7213b8819c0c07056f26c SHA256 96eb649fca220461403f1bd9d21bbb4ad08081351d1fce2a6f5e70f1a0fdf49b
 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 1487 RMD160 e125180446f89fc456e613910327f6d3c6919d6e SHA1 ece8ff70c65bed23bb38766d78ace7eae66752ce SHA256 a85db0224bf05bbc4d5312162ca0a796fd7883d7c3e9eb5e371776260b7cf89a
+EBUILD iwidgets-4.0.1-r2.ebuild 1520 RMD160 b3deef95a724a3b9d9709e3a9bc2bcae45ea2325 SHA1 454d71545e821c4d322ef68951360493b53955a5 SHA256 35c0de3e53165ebf8b91d6afad97289c11f63886861d563b0f8e2cf344dd7a61
 EBUILD iwidgets-4.0.1.ebuild 1003 RMD160 06efb1cfa1952923d2d2080d7dddc5b39a3c89a3 SHA1 0e2349319067a5ebfbe5370aaadf6ee509917cff SHA256 666a097e71bf028d78b29ce4f95238aa5fa2817ff210312ef6ca4c469b328238
-MISC ChangeLog 2425 RMD160 ac950eeb7cbdb428e6175ff35d051de91f9ef05a SHA1 534f6e7765b67226477beed773f75ace65180a98 SHA256 faf028d59ef83f0e1df19830c31841527f272fdd834d03544b45ca3811221feb
+MISC ChangeLog 2548 RMD160 eec933fd1b5bfb14d76ecbdc72fb76b1b23c4755 SHA1 6b4a75b30570fd61733f82a2aa666fa09c8001a2 SHA256 a99838c7658d0f1aedf98d7eedf11fd02c77ee546de1215f79b5c6d7e6bc8965
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAku9CgIACgkQAiZjviIA2XjWtQCgn3DOI4HYssmqfgKsgFQwK2Qe
-RmYAoJBVlz4A3ihPyKFgIu6OtauUkWFG
-=qNb9
+iEYEARECAAYFAkz+kX4ACgkQgAnW8HDreRZU2wCfYiND/jUPL/GnsJFAvQNHvel/
+MbIAmwTg7U1EDMwpPSjIq3TQ9hfgGcap
+=qfYd
 -----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
new file mode 100644
index 000000000000..e9c5a825ee43
--- /dev/null
+++ b/dev-tcltk/iwidgets/files/4.0.1-path.patch
@@ -0,0 +1,57 @@
+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
+ 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
++
++DATA_DIR = $(INSTALL_ROOT)$(prefix)/usr/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:
+ 	    done;
+ 
+ install-demos:
+-	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
+-	@echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
++	@$(MKINSTALLDIRS) $(DATA_DIR)/demos/images $(DATA_DIR)/demos/html
++	@echo "Installing demos from $(srcdir)/demos into $(DATA_DIR)/demos"
+ 	@for i in $(srcdir)/demos/*; \
+ 	    do \
+ 	    if [ -f $$i ] ; then \
+-	        $(INSTALL_SCRIPT) $$i $(SCRIPT_INSTALL_DIR)/demos; \
++	        $(INSTALL_SCRIPT) $$i $(DATA_DIR)/demos; \
+ 	    fi; \
+ 	    done;
+-	@echo "Installing images from $(srcdir)/demos/images into $(SCRIPT_INSTALL_DIR)/demos/images"
++	@echo "Installing images from $(srcdir)/demos/images into $(DATA_DIR)/demos/images"
+ 	for i in $(srcdir)/demos/images/*; \
+ 	    do \
+ 	    if [ -f $$i ] ; then \
+-	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
++	        $(INSTALL_DATA) $$i $(DATA_DIR)/demos/images; \
+ 	    fi; \
+ 	    done;
+-	@echo "Installing html man pages from $(srcdir)/demos/html into $(SCRIPT_INSTALL_DIR)/demos/html"
++	@echo "Installing html man pages from $(srcdir)/demos/html into $(DATA_DIR)/demos/html"
+ 	for i in $(srcdir)/demos/html/*; \
+ 	    do \
+ 	    if [ -f $$i ] ; then \
+-	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/html; \
++	        $(INSTALL_DATA) $$i $(DATA_DIR)/demos/html; \
+ 	    fi; \
+ 	    done;
+ 
+@@ -169,7 +171,6 @@ install-doc:
+ 	        $$i > $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
+ 	    chmod 444 $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
+ 	    done;
+-	$(INSTALL_DATA) $(srcdir)/license.terms $(SCRIPT_INSTALL_DIR)
+ 
+ Makefile: $(srcdir)/Makefile.in
+ 	$(SHELL) config.status
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r2.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r2.ebuild
index 31216b45c8e5..2b0b5ee0e5d3 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r2.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1-r2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2010 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.3 2010/04/07 22:40:57 flameeyes Exp $
+# $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 $
 
 EAPI="3"
 
-inherit multilib
+inherit eutils multilib
 
 MY_P="${PN}${PV}"
-S="${WORKDIR}/${MY_P}"
 ITCL_MY_P="itcl3.2.1"
 
 DESCRIPTION="Widget collection for incrTcl/incrTk"
@@ -25,7 +24,10 @@ DEPEND="
 	>=dev-tcltk/itk-3.2.1"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
+	epatch "${FILESDIR}"/${PV}-path.patch
 	sed -i -e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
 		Makefile.in || die
 
@@ -46,14 +48,14 @@ src_install() {
 	# parallel borks #177088
 	emake -j1 INSTALL_ROOT="${D}" install || die "emake install failed"
 
-	dodoc CHANGES ChangeLog README license.terms
+	dodoc CHANGES ChangeLog README
 
 	# bug 247184 - iwidget installs man pages in /usr/man
-	mkdir -p "${ED}"/usr/share/man/mann
-	mv "${ED}"/usr/man/mann/* "${ED}"/usr/share/man/mann/
-	rm -rf "${ED}"/usr/man
+#	mkdir -p "${ED}"/usr/share/man/mann
+#	mv "${ED}"/usr/man/mann/* "${ED}"/usr/share/man/mann/
+#	rm -rf "${ED}"/usr/man
 
 	# demos are in the wrong place:
-	mkdir -p "${ED}/usr/share/doc/${PF}"
-	mv "${ED}/usr/$(get_libdir)/${MY_P}/demos" "${ED}/usr/share/doc/${PF}/"
+#	mkdir -p "${ED}/usr/share/doc/${PF}"
+#	mv "${ED}/usr/$(get_libdir)/${MY_P}/demos" "${ED}/usr/share/doc/${PF}/"
 }