Use standard make install DESTDIR stuff.

4 files changed, 55 insertions, 8 deletions

diff --git a/app-editors/gnotepad+/ChangeLog b/app-editors/gnotepad+/ChangeLog
index 90e91680bd75..dafbfb8db77f 100644
--- a/app-editors/gnotepad+/ChangeLog
+++ b/app-editors/gnotepad+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gnotepad+
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gnotepad+/ChangeLog,v 1.5 2004/08/10 13:33:29 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gnotepad+/ChangeLog,v 1.6 2004/11/22 05:10:53 vapier Exp $
+
+  22 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/1.3.3-destdir.patch, gnotepad+-1.3.3.ebuild:
+  Use standard make install DESTDIR stuff.
 
   10 Aug 2004; Ferris McCormick <fmccor@gentoo.org> gnotepad+-1.3.3.ebuild:
   Add ~sparc keyword (Bug 59944).  Builds and appears to run on sparc.
diff --git a/app-editors/gnotepad+/Manifest b/app-editors/gnotepad+/Manifest
index c9ef8b474190..25ab8daea6c0 100644
--- a/app-editors/gnotepad+/Manifest
+++ b/app-editors/gnotepad+/Manifest
@@ -1,4 +1,15 @@
-MD5 07d7db0e9ae0768df9d5a858add40762 ChangeLog 736
-MD5 a113f3f56c61dfea9588c465f7e71e1e gnotepad+-1.3.3.ebuild 549
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 132fcbcaa13a7309f04bf365af4117ee ChangeLog 884
+MD5 30a5571a6bb86523495d5386ae119dec gnotepad+-1.3.3.ebuild 677
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 e3c578ce72afc2266ecc03accd403c0f files/digest-gnotepad+-1.3.3 67
+MD5 f1eb5e38852c9158e43e048112bb01d6 files/1.3.3-destdir.patch 834
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBoXUcHTu7gpaalycRAi82AJ977H/fyR8CJy/+K11jrfY6q5jgTACg8E6r
+W0HUVtnp8marYoAf4H7Y4l4=
+=/RrF
+-----END PGP SIGNATURE-----
diff --git a/app-editors/gnotepad+/files/1.3.3-destdir.patch b/app-editors/gnotepad+/files/1.3.3-destdir.patch
new file mode 100644
index 000000000000..77b6922672b4
--- /dev/null
+++ b/app-editors/gnotepad+/files/1.3.3-destdir.patch
@@ -0,0 +1,23 @@
+--- po/Makefile.in.in.orig	2004-11-22 00:23:00.651450006 -0500
++++ po/Makefile.in.in	2004-11-22 00:23:26.915121559 -0500
+@@ -111,16 +111,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-editors/gnotepad+/gnotepad+-1.3.3.ebuild b/app-editors/gnotepad+/gnotepad+-1.3.3.ebuild
index 6b60f24b4821..7cf04bbb04ab 100644
--- a/app-editors/gnotepad+/gnotepad+-1.3.3.ebuild
+++ b/app-editors/gnotepad+/gnotepad+-1.3.3.ebuild
@@ -1,18 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gnotepad+/gnotepad+-1.3.3.ebuild,v 1.6 2004/08/10 13:33:29 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gnotepad+/gnotepad+-1.3.3.ebuild,v 1.7 2004/11/22 05:10:53 vapier Exp $
 
-DESCRIPTION="Gnotepad+ is a simple HTML and text editor using the GTK Text Widget."
+inherit eutils
+
+DESCRIPTION="simple HTML and text editor"
 HOMEPAGE="http://gnotepad.sourceforge.net/"
 SRC_URI="http://download.sourceforge.net/gnotepad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
-src_install () {
-	einstall || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-destdir.patch
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
 }