Changed einstall to make DESTDIR=${D} install; bug #72015.

7 files changed, 151 insertions, 112 deletions

diff --git a/app-dicts/ebview/ChangeLog b/app-dicts/ebview/ChangeLog
index b924ec2acb97..d626a84895b8 100644
--- a/app-dicts/ebview/ChangeLog
+++ b/app-dicts/ebview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-dicts/ebview
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.17 2004/11/22 12:54:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.18 2004/11/23 10:53:44 usata Exp $
+
+  23 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/ebview-0.3.6-destdir.diff, -files/ebview-eb4-gentoo.diff,
+  -files/ebview-gtk24.diff, -ebview-0.3.5.ebuild, ebview-0.3.6.ebuild:
+  Changed einstall to make DESTDIR=${D} install; bug #72015.
 
   22 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> ebview-0.3.5.ebuild,
   ebview-0.3.6.ebuild:
diff --git a/app-dicts/ebview/ebview-0.3.5.ebuild b/app-dicts/ebview/ebview-0.3.5.ebuild
deleted file mode 100644
index 00b4977887d9..000000000000
--- a/app-dicts/ebview/ebview-0.3.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.5.ebuild,v 1.7 2004/11/22 12:54:41 usata Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="EBView -- Electronic Book Viewer based on GTK+"
-HOMEPAGE="http://ebview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ebview/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.57"
-RDEPEND=">=dev-libs/eb-3.3.4
-	>=x11-libs/gtk+-2.2
-	sys-devel/gettext"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-eb4-gentoo.diff
-	epatch ${FILESDIR}/${PN}-gtk24.diff
-	rm -rf autom4te.cache
-
-	if has_version '>=sys-devel/gettext-0.12' ; then
-		cd ${S}/po
-		epatch ${FILESDIR}/${PN}-gettext-0.12-gentoo.diff
-	fi
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF=2.5
-	autoreconf || die
-
-	econf --with-eb-conf=/etc/eb.conf || die
-	emake || die
-}
-
-src_install () {
-
-	# make DESTDIR=${D} doesn't work
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README TODO
-}
diff --git a/app-dicts/ebview/ebview-0.3.6.ebuild b/app-dicts/ebview/ebview-0.3.6.ebuild
index fa3ecf77a218..560a652c0d72 100644
--- a/app-dicts/ebview/ebview-0.3.6.ebuild
+++ b/app-dicts/ebview/ebview-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.6.ebuild,v 1.2 2004/11/22 12:54:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.6.ebuild,v 1.3 2004/11/23 10:53:44 usata Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 
 	unpack ${A}
 
+	epatch ${FILESDIR}/${P}-destdir.diff
 	if has_version '>=sys-devel/gettext-0.12' ; then
 		cd ${S}/po
 		epatch ${FILESDIR}/${PN}-gettext-0.12-gentoo.diff
@@ -36,8 +37,7 @@ src_compile() {
 
 src_install () {
 
-	# make DESTDIR=${D} install doesn't work
-	einstall || die
+	make DESTDIR=${D} install || die
 
 	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README TODO
 }
diff --git a/app-dicts/ebview/files/digest-ebview-0.3.5 b/app-dicts/ebview/files/digest-ebview-0.3.5
deleted file mode 100644
index ecf58371de79..000000000000
--- a/app-dicts/ebview/files/digest-ebview-0.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0122cdade0a0e0b8ee22d16bb35e6796 ebview-0.3.5.tar.gz 498200
diff --git a/app-dicts/ebview/files/ebview-0.3.6-destdir.diff b/app-dicts/ebview/files/ebview-0.3.6-destdir.diff
new file mode 100644
index 000000000000..7f14fadbebf3
--- /dev/null
+++ b/app-dicts/ebview/files/ebview-0.3.6-destdir.diff
@@ -0,0 +1,142 @@
+diff -urN ebview-0.3.6.ORIG/data/Makefile.am ebview-0.3.6/data/Makefile.am
+--- ebview-0.3.6.ORIG/data/Makefile.am	2004-02-15 22:59:38.000000000 +0900
++++ ebview-0.3.6/data/Makefile.am	2004-11-23 19:36:43.000000000 +0900
+@@ -6,13 +6,13 @@
+ 
+ install:
+ 	if test -r $(MKINSTALLDIRS); then \
+-		$(MKINSTALLDIRS) $(pkgdatadir); \
++		$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir); \
+ 	else \
+-		$(top_srcdir)/mkinstalldirs $(pkgdatadir); \
++		$(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \
+ 	fi; \
+ 	data="$(data)"; \
+ 	for file in $$data; do \
+-		$(INSTALL_DATA) $(srcdir)/$$file $(pkgdatadir)/$$file; \
++		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/$$file; \
+ 	done;
+ 
+ # Define this as empty until I found a useful application.
+@@ -21,7 +21,7 @@
+ uninstall:
+ 	data="$(data)"; \
+ 	for file in $$data; do \
+-	  rm -f $(pkgdatadir)/$$file; \
++	  rm -f $(DESTDIR)$(pkgdatadir)/$$file; \
+ 	done
+ 
+ mostlyclean:
+diff -urN ebview-0.3.6.ORIG/data/Makefile.in ebview-0.3.6/data/Makefile.in
+--- ebview-0.3.6.ORIG/data/Makefile.in	2004-08-07 00:35:16.000000000 +0900
++++ ebview-0.3.6/data/Makefile.in	2004-11-23 19:37:08.000000000 +0900
+@@ -304,13 +304,13 @@
+ 
+ install:
+ 	if test -r $(MKINSTALLDIRS); then \
+-		$(MKINSTALLDIRS) $(pkgdatadir); \
++		$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir); \
+ 	else \
+-		$(top_srcdir)/mkinstalldirs $(pkgdatadir); \
++		$(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \
+ 	fi; \
+ 	data="$(data)"; \
+ 	for file in $$data; do \
+-		$(INSTALL_DATA) $(srcdir)/$$file $(pkgdatadir)/$$file; \
++		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/$$file; \
+ 	done;
+ 
+ # Define this as empty until I found a useful application.
+@@ -319,7 +319,7 @@
+ uninstall:
+ 	data="$(data)"; \
+ 	for file in $$data; do \
+-	  rm -f $(pkgdatadir)/$$file; \
++	  rm -f $(DESTDIR)$(pkgdatadir)/$$file; \
+ 	done
+ 
+ mostlyclean:
+diff -urN ebview-0.3.6.ORIG/doc/Makefile.am ebview-0.3.6/doc/Makefile.am
+--- ebview-0.3.6.ORIG/doc/Makefile.am	2004-02-15 22:59:38.000000000 +0900
++++ ebview-0.3.6/doc/Makefile.am	2004-11-23 19:37:50.000000000 +0900
+@@ -9,15 +9,15 @@
+ 	dir="$(dir)"; \
+ 	for lang in $$dir; do \
+ 		if test -r $(MKINSTALLDIRS); then \
+-			$(MKINSTALLDIRS) $(pkgdatadir)/help/$$lang; \
++			$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/help/$$lang; \
+ 		else \
+-			$(top_srcdir)/mkinstalldirs $(pkgdatadir)/help/$$lang; \
++			$(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/help/$$lang; \
+ 		fi; \
+ 	done; \
+ 	data="$(data)"; \
+ 	for lang in $$dir; do \
+ 		for file in $$data; do \
+-			$(INSTALL_DATA) $(srcdir)/$$lang/$$file $(pkgdatadir)/help/$$lang/$$file; \
++			$(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)$(pkgdatadir)/help/$$lang/$$file; \
+ 		done; \
+ 	done;
+ 
+@@ -25,5 +25,5 @@
+ installcheck:
+ 
+ uninstall:
+-	rm -fr $(pkgdatadir)/help
++	rm -fr $(DESTDIR)$(pkgdatadir)/help
+ 
+diff -urN ebview-0.3.6.ORIG/doc/Makefile.in ebview-0.3.6/doc/Makefile.in
+--- ebview-0.3.6.ORIG/doc/Makefile.in	2004-08-07 00:35:16.000000000 +0900
++++ ebview-0.3.6/doc/Makefile.in	2004-11-23 19:38:09.000000000 +0900
+@@ -308,15 +308,15 @@
+ 	dir="$(dir)"; \
+ 	for lang in $$dir; do \
+ 		if test -r $(MKINSTALLDIRS); then \
+-			$(MKINSTALLDIRS) $(pkgdatadir)/help/$$lang; \
++			$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/help/$$lang; \
+ 		else \
+-			$(top_srcdir)/mkinstalldirs $(pkgdatadir)/help/$$lang; \
++			$(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/help/$$lang; \
+ 		fi; \
+ 	done; \
+ 	data="$(data)"; \
+ 	for lang in $$dir; do \
+ 		for file in $$data; do \
+-			$(INSTALL_DATA) $(srcdir)/$$lang/$$file $(pkgdatadir)/help/$$lang/$$file; \
++			$(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)$(pkgdatadir)/help/$$lang/$$file; \
+ 		done; \
+ 	done;
+ 
+@@ -324,7 +324,7 @@
+ installcheck:
+ 
+ uninstall:
+-	rm -fr $(pkgdatadir)/help
++	rm -fr $(DESTDIR)$(pkgdatadir)/help
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -urN ebview-0.3.6.ORIG/po/Makefile.in.in ebview-0.3.6/po/Makefile.in.in
+--- ebview-0.3.6.ORIG/po/Makefile.in.in	2004-02-22 15:34:42.000000000 +0900
++++ ebview-0.3.6/po/Makefile.in.in	2004-11-23 19:12:25.000000000 +0900
+@@ -115,16 +115,16 @@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/app-dicts/ebview/files/ebview-eb4-gentoo.diff b/app-dicts/ebview/files/ebview-eb4-gentoo.diff
deleted file mode 100644
index 9aace9e0f23a..000000000000
--- a/app-dicts/ebview/files/ebview-eb4-gentoo.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN ebview-0.3.2.ORIG/configure.in ebview-0.3.2/configure.in
---- ebview-0.3.2.ORIG/configure.in	2003-12-26 20:52:09.000000000 +0900
-+++ ebview-0.3.2/configure.in	2004-01-07 16:37:57.047564424 +0900
-@@ -21,8 +21,6 @@
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-             
--eb_LIB_EB3
--
- dnl Checks for header files.
- AC_PATH_X
- AC_HEADER_STDC
-@@ -33,6 +31,7 @@
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_PROG_GCC_TRADITIONAL
- AC_C_CONST
-+AC_C_PROTOTYPES
- AC_TYPE_PID_T
- AC_HEADER_TIME
- AC_TYPE_OFF_T
-@@ -42,6 +41,8 @@
- dnl Checks for library functions.
- AC_CHECK_FUNCS(mkdir select strdup strtol)
- 
-+eb_LIB_EB3
-+
- AC_DEFINE_UNQUOTED(LOCALEDIR, "${PREFIX}/share/locale", Where .mo file is.)
- AC_DEFINE_UNQUOTED(PACKAGEDIR, "${PREFIX}/share/${PACKAGE}", Where EBView data goes.)
- 
diff --git a/app-dicts/ebview/files/ebview-gtk24.diff b/app-dicts/ebview/files/ebview-gtk24.diff
deleted file mode 100644
index 8881127dace8..000000000000
--- a/app-dicts/ebview/files/ebview-gtk24.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN ebview-0.3.5/src/defs.h ebview-0.3.5_gtk240/src/defs.h
---- ebview-0.3.5/src/defs.h	2004-02-15 22:59:41.000000000 +0900
-+++ ebview-0.3.5_gtk240/src/defs.h	2004-04-02 02:04:04.868289632 +0900
-@@ -19,7 +19,9 @@
- #define __DEFS_H__
- 
- /* Disable old GTK+ functions */
-+#if (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION < 3)
- #define GTK_DISABLE_DEPRECATED 1
-+#endif
- 
- #include "../config.h"
- #include <sys/stat.h>
-diff -urN ebview-0.3.5/src/ebview.c ebview-0.3.5_gtk240/src/ebview.c
---- ebview-0.3.5/src/ebview.c	2004-02-22 12:46:29.000000000 +0900
-+++ ebview-0.3.5_gtk240/src/ebview.c	2004-04-02 02:03:39.758106960 +0900
-@@ -15,7 +15,9 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
- 
-+#if (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION < 3)
- #define GTK_DISABLE_DEPRECATED 1
-+#endif
- 
- #define _GLOBAL
- #include <signal.h>