Keep LFS layout, #295836

(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)

3 files changed, 73 insertions, 10 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/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}/"
 }