New version

6 files changed, 112 insertions, 59 deletions

diff --git a/dev-util/poedit/ChangeLog b/dev-util/poedit/ChangeLog
index 4dae5bba554a..aaa64751a33f 100644
--- a/dev-util/poedit/ChangeLog
+++ b/dev-util/poedit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/poedit
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/poedit/ChangeLog,v 1.5 2003/02/12 06:45:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/poedit/ChangeLog,v 1.6 2003/03/09 01:15:11 foser Exp $
+
+*poedit-1.2.1 (08 Mar 2003)
+
+  08 Mar 2003; foser <foser@gentoo.org> poedit-1.2.1.ebuild :
+  New version
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/dev-util/poedit/files/digest-poedit-1.2.1 b/dev-util/poedit/files/digest-poedit-1.2.1
new file mode 100644
index 000000000000..bc1d2096b24d
--- /dev/null
+++ b/dev-util/poedit/files/digest-poedit-1.2.1
@@ -0,0 +1 @@
+MD5 0e433328e9a5377f4b1d724dec6334f8 poedit-1.2.1.tar.bz2 724242
diff --git a/dev-util/poedit/files/poedit-1.1.5-gentoo.diff b/dev-util/poedit/files/poedit-1.1.5-gentoo.diff
deleted file mode 100644
index 0297457dbc60..000000000000
--- a/dev-util/poedit/files/poedit-1.1.5-gentoo.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -u install.orig/Makefile.am install/Makefile.am
---- install.orig/Makefile.am	Sat Nov  3 16:34:09 2001
-+++ install/Makefile.am	Fri Jan 25 16:22:30 2002
-@@ -4,17 +4,17 @@
- 
- if USE_KDE
- install-kde:
--	mkdir -p $(KDE_DATA_DIR)/icons
--	mkdir -p $(KDE_DATA_DIR)/mimelnk/application
--	mkdir -p $(KDE_DATA_DIR)/applnk/Development
-+	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/icons
-+	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application
-+	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development
- 	if test -w $(KDE_DATA_DIR)/icons ; then \
--	  install -m 644 $(top_srcdir)/src/appicon.xpm $(KDE_DATA_DIR)/icons/poedit.xpm; \
-+	  install -m 644 $(top_srcdir)/src/appicon.xpm $(DESTDIR)/$(KDE_DATA_DIR)/icons/poedit.xpm; \
- 	fi
- 	if test -w $(KDE_DATA_DIR)/mimelnk/application ; then \
--	  install -m 644 $(srcdir)/x-po.kdelnk $(KDE_DATA_DIR)/mimelnk/application; \
-+	  install -m 644 $(srcdir)/x-po.kdelnk $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application; \
- 	fi
- 	if test -w $(KDE_DATA_DIR)/applnk/Development ; then \
--	  install -m 644 $(srcdir)/poedit.kdelnk $(KDE_DATA_DIR)/applnk/Development; \
-+	  install -m 644 $(srcdir)/poedit.kdelnk $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development; \
- 	fi
- 
- else
-diff -u install.orig/Makefile.in install/Makefile.in
---- install.orig/Makefile.in	Mon Nov  5 16:11:56 2001
-+++ install/Makefile.in	Fri Jan 25 16:23:09 2002
-@@ -189,17 +189,17 @@
- install-data-local: install-gnome install-kde
- 
- @USE_KDE_TRUE@install-kde:
--@USE_KDE_TRUE@	mkdir -p $(KDE_DATA_DIR)/icons
--@USE_KDE_TRUE@	mkdir -p $(KDE_DATA_DIR)/mimelnk/application
--@USE_KDE_TRUE@	mkdir -p $(KDE_DATA_DIR)/applnk/Development
-+@USE_KDE_TRUE@	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/icons
-+@USE_KDE_TRUE@	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application
-+@USE_KDE_TRUE@	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development
- @USE_KDE_TRUE@	if test -w $(KDE_DATA_DIR)/icons ; then \
--@USE_KDE_TRUE@	  install -m 644 $(top_srcdir)/src/appicon.xpm $(KDE_DATA_DIR)/icons/poedit.xpm; \
-+@USE_KDE_TRUE@	  install -m 644 $(top_srcdir)/src/appicon.xpm $(DESTDIR)/$(KDE_DATA_DIR)/icons/poedit.xpm; \
- @USE_KDE_TRUE@	fi
- @USE_KDE_TRUE@	if test -w $(KDE_DATA_DIR)/mimelnk/application ; then \
--@USE_KDE_TRUE@	  install -m 644 $(srcdir)/x-po.kdelnk $(KDE_DATA_DIR)/mimelnk/application; \
-+@USE_KDE_TRUE@	  install -m 644 $(srcdir)/x-po.kdelnk $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application; \
- @USE_KDE_TRUE@	fi
- @USE_KDE_TRUE@	if test -w $(KDE_DATA_DIR)/applnk/Development ; then \
--@USE_KDE_TRUE@	  install -m 644 $(srcdir)/poedit.kdelnk $(KDE_DATA_DIR)/applnk/Development; \
-+@USE_KDE_TRUE@	  install -m 644 $(srcdir)/poedit.kdelnk $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development; \
- @USE_KDE_TRUE@	fi
- 
- @USE_KDE_FALSE@install-kde:
diff --git a/dev-util/poedit/files/poedit-1.2.1-gentoo_make_paths.patch b/dev-util/poedit/files/poedit-1.2.1-gentoo_make_paths.patch
new file mode 100644
index 000000000000..4b7c968c955d
--- /dev/null
+++ b/dev-util/poedit/files/poedit-1.2.1-gentoo_make_paths.patch
@@ -0,0 +1,60 @@
+diff -ur poedit-1.2.1/install/Makefile.am poedit-1.2.1.patched/install/Makefile.am
+--- poedit-1.2.1/install/Makefile.am	2002-07-02 23:28:02.000000000 +0200
++++ poedit-1.2.1.patched/install/Makefile.am	2003-03-09 00:56:30.000000000 +0100
+@@ -4,17 +4,17 @@
+ 
+ if USE_KDE
+ install-kde:
+-	mkdir -p $(KDE_DATA_DIR)/icons
+-	mkdir -p $(KDE_DATA_DIR)/mimelnk/application
+-	mkdir -p $(KDE_DATA_DIR)/applnk/Development
+-	if test -w $(KDE_DATA_DIR)/icons ; then \
+-	  install -m 644 $(top_srcdir)/src/appicon.xpm $(KDE_DATA_DIR)/icons/poedit.xpm; \
++	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/icons
++	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application
++	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development
++	if test -w $(DESTDIR)/$(KDE_DATA_DIR)/icons ; then \
++	  install -m 644 $(top_srcdir)/src/appicon.xpm $(DESTDIR)/$(KDE_DATA_DIR)/icons/poedit.xpm; \
+ 	fi
+-	if test -w $(KDE_DATA_DIR)/mimelnk/application ; then \
+-	  install -m 644 $(srcdir)/x-po.desktop $(KDE_DATA_DIR)/mimelnk/application; \
++	if test -w $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application ; then \
++	  install -m 644 $(srcdir)/x-po.desktop $(DISTDIR)/$(KDE_DATA_DIR)/mimelnk/application; \
+ 	fi
+-	if test -w $(KDE_DATA_DIR)/applnk/Development ; then \
+-	  install -m 644 $(srcdir)/poedit.desktop $(KDE_DATA_DIR)/applnk/Development; \
++	if test -w $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development ; then \
++	  install -m 644 $(srcdir)/poedit.desktop $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development; \
+ 	fi
+ 
+ else
+diff -ur poedit-1.2.1/install/Makefile.in poedit-1.2.1.patched/install/Makefile.in
+--- poedit-1.2.1/install/Makefile.in	2003-02-06 17:31:14.000000000 +0100
++++ poedit-1.2.1.patched/install/Makefile.in	2003-03-09 00:57:07.000000000 +0100
+@@ -201,17 +201,17 @@
+ install-data-local: install-gnome install-kde
+ 
+ @USE_KDE_TRUE@install-kde:
+-@USE_KDE_TRUE@	mkdir -p $(KDE_DATA_DIR)/icons
+-@USE_KDE_TRUE@	mkdir -p $(KDE_DATA_DIR)/mimelnk/application
+-@USE_KDE_TRUE@	mkdir -p $(KDE_DATA_DIR)/applnk/Development
+-@USE_KDE_TRUE@	if test -w $(KDE_DATA_DIR)/icons ; then \
+-@USE_KDE_TRUE@	  install -m 644 $(top_srcdir)/src/appicon.xpm $(KDE_DATA_DIR)/icons/poedit.xpm; \
++@USE_KDE_TRUE@	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/icons
++@USE_KDE_TRUE@	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application
++@USE_KDE_TRUE@	mkdir -p $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development
++@USE_KDE_TRUE@	if test -w $(DESTDIR)/$(KDE_DATA_DIR)/icons ; then \
++@USE_KDE_TRUE@	  install -m 644 $(top_srcdir)/src/appicon.xpm $(DESTDIR)/$(KDE_DATA_DIR)/icons/poedit.xpm; \
+ @USE_KDE_TRUE@	fi
+-@USE_KDE_TRUE@	if test -w $(KDE_DATA_DIR)/mimelnk/application ; then \
+-@USE_KDE_TRUE@	  install -m 644 $(srcdir)/x-po.desktop $(KDE_DATA_DIR)/mimelnk/application; \
++@USE_KDE_TRUE@	if test -w $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application ; then \
++@USE_KDE_TRUE@	  install -m 644 $(srcdir)/x-po.desktop $(DESTDIR)/$(KDE_DATA_DIR)/mimelnk/application; \
+ @USE_KDE_TRUE@	fi
+-@USE_KDE_TRUE@	if test -w $(KDE_DATA_DIR)/applnk/Development ; then \
+-@USE_KDE_TRUE@	  install -m 644 $(srcdir)/poedit.desktop $(KDE_DATA_DIR)/applnk/Development; \
++@USE_KDE_TRUE@	if test -w $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development ; then \
++@USE_KDE_TRUE@	  install -m 644 $(srcdir)/poedit.desktop $(DESTDIR)/$(KDE_DATA_DIR)/applnk/Development; \
+ @USE_KDE_TRUE@	fi
+ 
+ @USE_KDE_FALSE@install-kde:
diff --git a/dev-util/poedit/poedit-1.1.8.ebuild b/dev-util/poedit/poedit-1.1.8.ebuild
index f56753aaef2d..f8c6f1ade14a 100644
--- a/dev-util/poedit/poedit-1.1.8.ebuild
+++ b/dev-util/poedit/poedit-1.1.8.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/poedit/poedit-1.1.8.ebuild,v 1.6 2003/02/13 11:59:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/poedit/poedit-1.1.8.ebuild,v 1.7 2003/03/09 01:15:11 foser Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Cross-platform gettext catalogs (.po files) editor."
 SRC_URI="mirror://sourceforge/poedit/${P}.tar.bz2"
 HOMEPAGE="http://poedit.sourceforge.net/"
@@ -15,11 +16,12 @@ DEPEND=">=x11-libs/wxGTK-2.3.2
 	>=sys-libs/db-3"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
+	# fixes bug 16713
+	epatch ${FILESDIR}/${P}-gcc3.patch
 }
 
 src_compile() {
diff --git a/dev-util/poedit/poedit-1.2.1.ebuild b/dev-util/poedit/poedit-1.2.1.ebuild
new file mode 100644
index 000000000000..93033d2a854f
--- /dev/null
+++ b/dev-util/poedit/poedit-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/poedit/poedit-1.2.1.ebuild,v 1.1 2003/03/09 01:15:11 foser Exp $
+
+inherit eutils
+
+DESCRIPTION="Cross-platform gettext catalogs (.po files) editor."
+SRC_URI="mirror://sourceforge/poedit/${P}.tar.bz2"
+HOMEPAGE="http://poedit.sourceforge.net/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND=">=x11-libs/wxGTK-2.3.4
+	>=sys-libs/db-3"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo_make_paths.patch
+}
+
+src_compile() {
+	autoconf
+	automake
+
+	econf || die
+	emake || die
+}
+
+src_install () {
+	einstall \
+		datadir=${D}/usr/share \
+		GNOME_DATA_DIR=${D}/usr/share || die
+
+	dodoc AUTHORS LICENSE NEWS README TODO
+}