Version bump. Move to wxGTK-2.8 and EAPI 1.

Package-Manager: portage-2.1.4_rc11

6 files changed, 111 insertions, 18 deletions

diff --git a/app-i18n/poedit/ChangeLog b/app-i18n/poedit/ChangeLog
index fdd94de6abe3..95c9493264ef 100644
--- a/app-i18n/poedit/ChangeLog
+++ b/app-i18n/poedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/poedit
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/ChangeLog,v 1.46 2007/09/19 03:33:55 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/ChangeLog,v 1.47 2007/12/23 18:31:34 dirtyepic Exp $
+
+*poedit-1.3.9 (23 Dec 2007)
+
+  23 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/poedit-1.3.9-sobsolete.patch, poedit-1.3.7.ebuild,
+  +poedit-1.3.9.ebuild:
+  Version bump.  Move to wxGTK-2.8 and EAPI 1.
 
   19 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> poedit-1.3.6.ebuild:
   lock wxGTK depend to 2.6
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 9c0251b089fe..dae0476371d8 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,17 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX poedit-1.3.9-sobsolete.patch 469 RMD160 ea05e98185066540e536228fddbee822cef51d19 SHA1 736a37d4680159a4f1ecc48e85c90bb3f2040fd5 SHA256 000b626a45042379c23d228348c8cf50bbac0bf8050e76aaf93ac5f95580f49a
+MD5 a2d6c3fe142e25a958ba0bb88ec86486 files/poedit-1.3.9-sobsolete.patch 469
+RMD160 ea05e98185066540e536228fddbee822cef51d19 files/poedit-1.3.9-sobsolete.patch 469
+SHA256 000b626a45042379c23d228348c8cf50bbac0bf8050e76aaf93ac5f95580f49a files/poedit-1.3.9-sobsolete.patch 469
 DIST poedit-1.3.6.tar.gz 2606278 RMD160 d49dce9401def566f9e2f04262e78e48a34c5e25 SHA1 41b92160aa38bacbc6a0dc013a5d89dd71d3fb19 SHA256 c9c56fdccfa2e83c4c4cdc8cb83d414d00b81caedfb0eb1fa3f9de4045d661f2
 DIST poedit-1.3.7.tar.gz 2167648 RMD160 4b184ae5521eb86b79ae7bbe0d15238066bc1540 SHA1 4086a1594e0af71fb664ac773d5e7700799ee8c9 SHA256 65fd0a32c6a152d7d5aad0277d9b9cb33a0632fd68bcad09130697446ab6a594
+DIST poedit-1.3.9.tar.gz 1650758 RMD160 16434167e8eff1a03c4ffca40c4235593aa77022 SHA1 c5fc46ca86797d9e78336c69e05e7302dc1a134e SHA256 4803cde2f95412184b92193c0f34136da286c852bc5dd92c036e40e59054de04
 EBUILD poedit-1.3.6.ebuild 921 RMD160 9539ef2fe67a3be258a6690623b30e3806b703e2 SHA1 6e1d4334d3f334593c3fb35223d5ab478d9bfe5f SHA256 401d77bc04db6a485272df99b8889fa04b0c023cab8141beb12126ac469bc291
 MD5 5578ff436fba8465b85088367e4b98da poedit-1.3.6.ebuild 921
 RMD160 9539ef2fe67a3be258a6690623b30e3806b703e2 poedit-1.3.6.ebuild 921
 SHA256 401d77bc04db6a485272df99b8889fa04b0c023cab8141beb12126ac469bc291 poedit-1.3.6.ebuild 921
-EBUILD poedit-1.3.7.ebuild 1093 RMD160 817ee2fb838095ae7441e7718d4145a5e4e87897 SHA1 1801f3d73a7198e0ea1693eef4a05cf4e54f6bdf SHA256 1e63bf68e824235d3b9175ba1c0e0862ad428a0c358db133f7bd562619f9c15b
-MD5 270716c7da1bc383b91efe8bd2a72506 poedit-1.3.7.ebuild 1093
-RMD160 817ee2fb838095ae7441e7718d4145a5e4e87897 poedit-1.3.7.ebuild 1093
-SHA256 1e63bf68e824235d3b9175ba1c0e0862ad428a0c358db133f7bd562619f9c15b poedit-1.3.7.ebuild 1093
-MISC ChangeLog 8591 RMD160 3fb2a61d32d9bb55c3929da28e57ae0fc5ebed26 SHA1 5763f662c0a135a4c15c499a67a138481e2205db SHA256 04c3a7b477bc43682163241d7c66300405e28a7aef0de06baa969bb1e69960cf
-MD5 de2d1343e57cb454ac8622ba25884318 ChangeLog 8591
-RMD160 3fb2a61d32d9bb55c3929da28e57ae0fc5ebed26 ChangeLog 8591
-SHA256 04c3a7b477bc43682163241d7c66300405e28a7aef0de06baa969bb1e69960cf ChangeLog 8591
+EBUILD poedit-1.3.7.ebuild 1011 RMD160 66f662f9ca78cb61eb9b7f0a92337594408ac147 SHA1 85f894d9fe4c82becc40bcb55690484ee0fa0575 SHA256 571b14c2515d65541bdcf70d6bf0920b176fb33019cc6e9e079970b1a3112f25
+MD5 2af544cbc350dc1053ce9474ab472364 poedit-1.3.7.ebuild 1011
+RMD160 66f662f9ca78cb61eb9b7f0a92337594408ac147 poedit-1.3.7.ebuild 1011
+SHA256 571b14c2515d65541bdcf70d6bf0920b176fb33019cc6e9e079970b1a3112f25 poedit-1.3.7.ebuild 1011
+EBUILD poedit-1.3.9.ebuild 1169 RMD160 8d91e14239ab308dc02a1ec0f9e67c9f5a952909 SHA1 a60cce865bd8d1e3e61504b02e3b194b7ea36802 SHA256 8fce1e6e97248deda268e3f439c274e189b1078d312c2e1900cfffcc5d895bcd
+MD5 768a1e872c9801c01819e71f1ee07e36 poedit-1.3.9.ebuild 1169
+RMD160 8d91e14239ab308dc02a1ec0f9e67c9f5a952909 poedit-1.3.9.ebuild 1169
+SHA256 8fce1e6e97248deda268e3f439c274e189b1078d312c2e1900cfffcc5d895bcd poedit-1.3.9.ebuild 1169
+MISC ChangeLog 8800 RMD160 0c67864a8631f39c5e9e3d39e3936d13cf761c1e SHA1 75a4e55099affc957d8866555678ab73ab4a3f94 SHA256 bd98231683003e18e3fa25fd209cf63975bb670bcc9caf1d516c3f435e9237e7
+MD5 68f28a7fabf9b34f270e903441472813 ChangeLog 8800
+RMD160 0c67864a8631f39c5e9e3d39e3936d13cf761c1e ChangeLog 8800
+SHA256 bd98231683003e18e3fa25fd209cf63975bb670bcc9caf1d516c3f435e9237e7 ChangeLog 8800
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -22,3 +34,13 @@ SHA256 8e2831de8938b840c2628a08ab71f13bced50728089f8fbf5d97c79b3c46fe0d files/di
 MD5 607bbc66ffcbc2610730b075a2cd32f6 files/digest-poedit-1.3.7 241
 RMD160 27d09840281dcb14da4a87ae139f5e83ddf00c05 files/digest-poedit-1.3.7 241
 SHA256 78864b24f9b37318ab703b9e713f21c18a3b412ff6ecacc42f6615081794a87c files/digest-poedit-1.3.7 241
+MD5 3d6f8d2bf2af413bed40ca95a7f89a95 files/digest-poedit-1.3.9 241
+RMD160 da3ca775715da922f94fbd09d022ccea7ad17dd2 files/digest-poedit-1.3.9 241
+SHA256 4680aee07b3f070f7e8edd126a84169a2905b1fe542fa67284685bca08c42d64 files/digest-poedit-1.3.9 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkduqYsACgkQiqiDRvmkBmIzEwCfRJjF8U5vUa9RcHY9QGCedqiq
+skIAoJolBcDN3vzZq5P2lsd4eQBUaueB
+=C6oB
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/poedit/files/digest-poedit-1.3.9 b/app-i18n/poedit/files/digest-poedit-1.3.9
new file mode 100644
index 000000000000..81779a2b19f0
--- /dev/null
+++ b/app-i18n/poedit/files/digest-poedit-1.3.9
@@ -0,0 +1,3 @@
+MD5 2e2b921c9684f1bd9dba2535d97bd34e poedit-1.3.9.tar.gz 1650758
+RMD160 16434167e8eff1a03c4ffca40c4235593aa77022 poedit-1.3.9.tar.gz 1650758
+SHA256 4803cde2f95412184b92193c0f34136da286c852bc5dd92c036e40e59054de04 poedit-1.3.9.tar.gz 1650758
diff --git a/app-i18n/poedit/files/poedit-1.3.9-sobsolete.patch b/app-i18n/poedit/files/poedit-1.3.9-sobsolete.patch
new file mode 100644
index 000000000000..0e39f2d896bc
--- /dev/null
+++ b/app-i18n/poedit/files/poedit-1.3.9-sobsolete.patch
@@ -0,0 +1,12 @@
+diff -Naur poedit-1.3.9-orig/src/catalog.cpp poedit-1.3.9/src/catalog.cpp
+--- poedit-1.3.9-orig/src/catalog.cpp	2007-11-09 04:35:59.000000000 -0600
++++ poedit-1.3.9/src/catalog.cpp	2007-12-23 12:11:46.000000000 -0600
+@@ -1497,7 +1497,7 @@
+                               wxArrayString& snew, wxArrayString& sobsolete)
+ {
+     wxASSERT( snew.empty() );
+-    wxASSERT( sbsolete.empty() );
++    wxASSERT( sobsolete.empty() );
+ 
+     std::set<wxString> strsThis, strsRef;
+ 
diff --git a/app-i18n/poedit/poedit-1.3.7.ebuild b/app-i18n/poedit/poedit-1.3.7.ebuild
index a02b4c42d364..ec3175de538d 100644
--- a/app-i18n/poedit/poedit-1.3.7.ebuild
+++ b/app-i18n/poedit/poedit-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/poedit-1.3.7.ebuild,v 1.2 2007/09/15 23:29:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/poedit-1.3.7.ebuild,v 1.3 2007/12/23 18:31:34 dirtyepic Exp $
 
 inherit eutils wxwidgets flag-o-matic fdo-mime
 
@@ -17,25 +17,22 @@ DEPEND="=x11-libs/wxGTK-2.6*
 	>=sys-libs/db-3.1
 	spell? ( >=app-text/gtkspell-2.0.0 )"
 
-WX_GTK_VER="2.6"
-
-pkg_setup() {
-	echo; check_wxuse unicode; echo
-}
 
 src_compile() {
-	need-wxwidgets unicode
 	append-flags -fno-strict-aliasing
 
+	WX_GTK_VER="2.6"
+	need-wxwidgets unicode
+
 	econf \
 		$(use_enable spell spellchecking) \
-		--with-wx-config="${WX_CONFIG}" \
 		|| die "Configure failed!"
+
 	emake || die "Build failed!"
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${D}" install || die "Install failed"
 	dodoc AUTHORS NEWS README TODO
 }
 
diff --git a/app-i18n/poedit/poedit-1.3.9.ebuild b/app-i18n/poedit/poedit-1.3.9.ebuild
new file mode 100644
index 000000000000..0e107a70dd19
--- /dev/null
+++ b/app-i18n/poedit/poedit-1.3.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/poedit-1.3.9.ebuild,v 1.1 2007/12/23 18:31:34 dirtyepic Exp $
+
+EAPI=1
+WX_GTK_VER=2.8
+
+inherit eutils wxwidgets flag-o-matic fdo-mime
+
+DESCRIPTION="Cross-platform gettext catalogs (.po files) editor."
+SRC_URI="mirror://sourceforge/poedit/${P}.tar.gz"
+HOMEPAGE="http://poedit.sourceforge.net/"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="spell"
+
+DEPEND="x11-libs/wxGTK:2.8
+	>=sys-libs/db-3.1
+	spell? ( >=app-text/gtkspell-2.0.0 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1857103&group_id=27043&atid=389153
+	epatch "${FILESDIR}"/${P}-sobsolete.patch
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	econf \
+		$(use_enable spell spellchecking) \
+		|| die "Configure failed!"
+
+	emake || die "Build failed!"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}