Version bump.

svn path=/; revision=233

5 files changed, 48 insertions, 61 deletions

diff --git a/app-dicts/makedict/Manifest b/app-dicts/makedict/Manifest
index 44ff250..45cf257 100644
--- a/app-dicts/makedict/Manifest
+++ b/app-dicts/makedict/Manifest
@@ -1,6 +1,6 @@
-AUX makedict-0.3-codecs.patch 1129 RMD160 b92592c723443b329704970c3e386718eed4ee39 SHA1 7570c23f974a99f9ad530724bbf61debd792a7f0 SHA256 ab8c736880423d3c7ff3aa0f4382a9ec306c9422f804c1254d8091aab19b0750
-DIST makedict-0.3.tar.bz2 133855 RMD160 81de006fd93ff0b7d626759895a6845965abba86 SHA1 798cdd3a481384e207f58b40197f891bf7f61fce SHA256 7a7a345cfe9bdd179d30a56f503fdfa53990efedb94fb150203feb82cfa25517
-EBUILD makedict-0.3.ebuild 717 RMD160 aa45ec38b40b8936b80f7316cacab13133c61822 SHA1 c7838dc6ba8afd5405c88eff6beb2c1ffa58e571 SHA256 049f8cbffdf654194737e3f40e38144d06140a869ddfd44a6b0d0e661408375c
-EBUILD makedict-0.9999.ebuild 633 RMD160 fcd4fd568204ab4b04801c86ea522908d44ac291 SHA1 3b6cdb644cd1b540733d9caaf8a08671f6e43394 SHA256 06fc67cffdf5836e9ade7d71a06a7d4e50e1a3ab5abf7834ccbaed51b666e70f
+AUX makedict-0.3-codecs.patch 240 RMD160 3084168f0e2c33e7166bf6f7f8c6493009f95b2b SHA1 7eff7b95795c8a732c8f3543bb36bfcdfb780d5d SHA256 5491b5b197d71a0a9edc48fb2fe4eb42a35577c37109e90929c3c21e814b88f1
+DIST makedict-0.3.1-beta1-Source.tar.bz2 65891 RMD160 8c1ce12eb81cd3bd4eb68b4f0687bbb537131a4a SHA1 31bb87f7f99ab3bd2304d6cd8d13ea5537a47f27 SHA256 9c39cc43b6fc1c397753038e54bb6fc9f62f84364762c5d58d3a5b4cc2fd2099
+EBUILD makedict-0.3.1_beta1.ebuild 959 RMD160 dadf501d1f761e1381bff25409a85a003b8b475d SHA1 5bbbd4d09412f4aa46a3c0cc24f7e64d8489b9ef SHA256 b01b1c3f4b9e43ab2c83d785af8680ad7eefd1487b5128bdf2e0b1b7c2463df5
+EBUILD makedict-0.9999.ebuild 629 RMD160 0a22e31bff456d8b4ae847074972b37287a6a9c4 SHA1 d7fb5260531233e866f832daf5c6dde109c599ec SHA256 b42e01ebb9a273f7f742ffbc8639fe8ce8c0fb1681322d991efbc7084362b7a6
 MISC ChangeLog 385 RMD160 2da9adec06e14baaf47aefd09aaeade65f56a39b SHA1 71312677d5569c39a133a77c1b965892c286a82f SHA256 d7421575588a3d4a225a9fe43e86dec824dff6d6bb6170092932a4a6865ad126
 MISC metadata.xml 348 RMD160 c6835eeeb06f4f4b7bac88361763ab469c8ac28c SHA1 ef8a9dda1ab44490fdcb912a6cd1344d50d70e8c SHA256 93cb1356d969cbbd1f4e5b1beb90f30f21c0231292d6ef7dc82e76143167a739
diff --git a/app-dicts/makedict/files/makedict-0.3-codecs.patch b/app-dicts/makedict/files/makedict-0.3-codecs.patch
index d8a72f8..c0bc9bc 100644
--- a/app-dicts/makedict/files/makedict-0.3-codecs.patch
+++ b/app-dicts/makedict/files/makedict-0.3-codecs.patch
@@ -7,23 +7,3 @@
  import sys, os
  from optparse import OptionParser
  
---- ./src/Makefile.am.orig	2007-10-01 14:41:58.000000000 +0400
-+++ ./src/Makefile.am	2007-10-01 14:43:15.000000000 +0400
-@@ -44,13 +44,13 @@
- 
- INCLUDES = @MAKEDICT_CFLAGS@  -I$(top_builddir) 
- #DEFS=-DLOCALEDIR=\"$(localedir)\" @DEFS@
--DEFS = -DDUMMY_FORMAT_NAME=\"dummy\" -DCODECSDIR=\""$(bindir)/makedict-codecs"\" @DEFS@ 
-+DEFS = -DDUMMY_FORMAT_NAME=\"dummy\" -DCODECSDIR=\""$(libdir)/makedict-codecs"\" @DEFS@ 
- 
- install-plugins:
--	$(INSTALL_PROGRAM) -d $(bindir)/makedict-codecs/
-+	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libdir)/makedict-codecs/
- 	for util in $(CODECS); do \
--		$(INSTALL_PROGRAM) $$util $(bindir)/makedict-codecs/ ; \
-+		$(INSTALL_PROGRAM) $$util $(DESTDIR)$(libdir)/makedict-codecs/ ; \
- 	done
- 	for util in $(SCRIPT_CODECS); do \
--		$(INSTALL_PROGRAM) $$util $(bindir)/makedict-codecs/ ; \
-+		$(INSTALL_PROGRAM) $$util $(DESTDIR)$(libdir)/makedict-codecs/ ; \
- 	done
diff --git a/app-dicts/makedict/makedict-0.3.1_beta1.ebuild b/app-dicts/makedict/makedict-0.3.1_beta1.ebuild
new file mode 100644
index 0000000..dbc9306
--- /dev/null
+++ b/app-dicts/makedict/makedict-0.3.1_beta1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils cmake-utils
+
+MY_P=${PN}-${PV/_/-}-Source
+
+DESCRIPTION="XDXF based converter from any dictionary format to any"
+HOMEPAGE="http://xdxf.sf.net/"
+SRC_URI="mirror://sourceforge/xdxf/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/glib-2.6.0
+		dev-libs/expat
+		sys-libs/zlib"
+RDEPEND="${DEPEND}
+		dev-lang/python"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS README TODO ChangeLog"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed 's:\(#include "repository.hpp"\):\1\n#include "generator.hpp":' \
+			-i src/parser.hpp
+	sed 's:\(#define _LANGS_2TO3_HPP_\):\1\n\n#include <string>:' \
+			-i src/langs_2to3.hpp
+
+#	epatch "${FILESDIR}"/${P}-codecs.patch
+}
+
+dont_src_install() {
+	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install-plugins -C src || die
+	dodoc AUTHORS README TODO ChangeLog
+}
diff --git a/app-dicts/makedict/makedict-0.3.ebuild b/app-dicts/makedict/makedict-0.3.ebuild
deleted file mode 100644
index 3dfc02d..0000000
--- a/app-dicts/makedict/makedict-0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools
-
-DESCRIPTION="XDXF based converter from any dictionary format to any"
-HOMEPAGE="http://xdxf.sf.net/"
-SRC_URI="mirror://sourceforge/xdxf/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="app-doc/doxygen
-		=dev-libs/glib-2*
-		dev-libs/expat
-		dev-lang/python
-		sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-codecs.patch
-
-	AT_M4DIR=m4
-	eautoreconf
-}
-src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install-plugins -C src || die
-	dodoc AUTHORS README TODO ChangeLog
-}
diff --git a/app-dicts/makedict/makedict-0.9999.ebuild b/app-dicts/makedict/makedict-0.9999.ebuild
index 6a03037..d0a71d0 100644
--- a/app-dicts/makedict/makedict-0.9999.ebuild
+++ b/app-dicts/makedict/makedict-0.9999.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.6.0