Fixed postgresql-8.3 issue, bug #239594. Removed old revisions.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

5 files changed, 39 insertions, 38 deletions

diff --git a/dev-db/pgmecab/ChangeLog b/dev-db/pgmecab/ChangeLog
index 43b706e56226..f29f5b8fd123 100644
--- a/dev-db/pgmecab/ChangeLog
+++ b/dev-db/pgmecab/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/pgmecab
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmecab/ChangeLog,v 1.3 2008/08/14 23:54:50 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmecab/ChangeLog,v 1.4 2008/11/02 08:55:33 matsuu Exp $
+
+*pgmecab-1.1-r2 (02 Nov 2008)
+
+  02 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/pgmecab-1.1-postgres83.patch, -pgmecab-1.1.ebuild,
+  -pgmecab-1.1-r1.ebuild, +pgmecab-1.1-r2.ebuild:
+  Fixed postgresql-8.3 issue, bug #239594. Removed old revisions.
 
 *pgmecab-1.1-r1 (14 Aug 2008)
 
diff --git a/dev-db/pgmecab/Manifest b/dev-db/pgmecab/Manifest
index 7e20af121f45..f42654fbe903 100644
--- a/dev-db/pgmecab/Manifest
+++ b/dev-db/pgmecab/Manifest
@@ -1,6 +1,6 @@
 AUX pgmecab-1.1-gentoo.patch 768 RMD160 424e359a4520726278a5c6fa4fbf731d8d9720cc SHA1 00c9100709a750c7d4bd93c2c707942d14091c11 SHA256 ea69d125795ce97ce7ba43e91ae5f5ac61540ee48df2491ef50379288612e0cf
+AUX pgmecab-1.1-postgres83.patch 691 RMD160 06d415a264ef2374670f02a74a19175a7b7700ec SHA1 a3e82b63b02ee3d83ea9579a9273d2989ee919af SHA256 ee7a23d6b4d43f374315cee913dde49d505ba22dea41e2c85d79e2bd7fb8fe8d
 DIST pgmecab-1.1.tar.bz2 9388 RMD160 9207e2e12dadb6893dde907a09eb8e9776ba6fb9 SHA1 4f7cf2a3e66c4893237ee3fa2ebc1ee37222918f SHA256 fd300f4fa65232a7c4e9ec0637677fb042378073c78561295c84131246a94105
-EBUILD pgmecab-1.1-r1.ebuild 757 RMD160 cd637e0093ce7a36f4cd4dfb8d365e96272008ad SHA1 f7579214e3e8e3133c79a9e9841ee9b7108286ad SHA256 326fbeb430c761596a477336bd3faa96b62efc1a5841b16c9da37f1c638f6566
-EBUILD pgmecab-1.1.ebuild 767 RMD160 aa18445e6af73e4ad0e5567a688c645b5df0b3af SHA1 248e47e4fcc7e8582a13a586644a0a47a9ef9b68 SHA256 0d0f1825260ee59dcdeeaa2dcde2574430d7b76dca2349e9627e3ae9a1210573
-MISC ChangeLog 693 RMD160 de116666a436349dfa4ed09e6c1d5b6d3e085afd SHA1 c681162ddb5651c927d238f1efdd49b78119e268 SHA256 674af7515bf0f2dba6561ccc699b90577ceded6785a480796591cc253eee4bb4
+EBUILD pgmecab-1.1-r2.ebuild 824 RMD160 13c2b3c61d8a3d28884e8d42bcfa5932a4432960 SHA1 b19edc786c41d4bc6c863020e2f06c106d15c6e2 SHA256 9b7c26b4b8713d7281b682fde27024266e67716e8b244fac54c7e0f00c98ef43
+MISC ChangeLog 950 RMD160 e9a3927cf3ada16f2f9ff865c0c9fa47e92b2ddd SHA1 ee462f37640b01b4ede5bc47a2629701725b665e SHA256 dd0b2ed2deb2a28e69402e4fac40e048b8726cfa037e671eefb109d2df675c16
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/dev-db/pgmecab/files/pgmecab-1.1-postgres83.patch b/dev-db/pgmecab/files/pgmecab-1.1-postgres83.patch
new file mode 100644
index 000000000000..30d2e87a8e2f
--- /dev/null
+++ b/dev-db/pgmecab/files/pgmecab-1.1-postgres83.patch
@@ -0,0 +1,20 @@
+--- pgmecab.c.orig	2008-10-05 13:24:34.000000000 +0200
++++ pgmecab.c	2008-10-05 13:25:17.000000000 +0200
+@@ -24,7 +24,7 @@
+ static Datum returnEmptyStr()
+ {
+ 	text* emptyVal = (text*) palloc(VARHDRSZ);
+-	VARATT_SIZEP(emptyVal) = VARHDRSZ;
++	SET_VARLENA_LEN(emptyVal, VARHDRSZ);
+ 	PG_RETURN_TEXT_P(emptyVal);
+ }
+ 
+@@ -90,7 +90,7 @@
+ 	
+ 	/* 返すためのメモリ確保 */
+ 	text* return_val = (text *) palloc(VARHDRSZ + mecab_result_size * sizeof(char));
+-	VARATT_SIZEP(return_val) = VARHDRSZ + mecab_result_size * sizeof(char);
++	SET_VARLENA_LEN(return_val, VARHDRSZ + mecab_result_size * sizeof(char));
+ 	
+ 	/* 結果をコピー */
+ 	memcpy((void*)VARDATA(return_val), mecab_result, mecab_result_size);
diff --git a/dev-db/pgmecab/pgmecab-1.1-r1.ebuild b/dev-db/pgmecab/pgmecab-1.1-r2.ebuild
index 1d7f215e5eca..ac7d91f144d3 100644
--- a/dev-db/pgmecab/pgmecab-1.1-r1.ebuild
+++ b/dev-db/pgmecab/pgmecab-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmecab/pgmecab-1.1-r1.ebuild,v 1.1 2008/08/14 23:54:50 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmecab/pgmecab-1.1-r2.ebuild,v 1.1 2008/11/02 08:55:33 matsuu Exp $
 
 inherit eutils
 
@@ -8,18 +8,19 @@ DESCRIPTION="PostgreSQL function to Wakachigaki for Japanese words"
 HOMEPAGE="http://www.emaki.minidns.net/Programming/postgres/index.html"
 SRC_URI="http://www.emaki.minidns.net/Programming/postgres/${P}.tar.bz2"
 
-DEPEND="app-text/mecab
-	>=virtual/postgresql-server-7.4"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="app-text/mecab
+	>=virtual/postgresql-server-7.4"
+
 src_unpack () {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-postgres83.patch"
 }
 
 src_compile() {
@@ -28,4 +29,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" USE_PGXS=1 install || die
+
+	dodoc README.pgmecab
 }
diff --git a/dev-db/pgmecab/pgmecab-1.1.ebuild b/dev-db/pgmecab/pgmecab-1.1.ebuild
deleted file mode 100644
index 8638dc608e5f..000000000000
--- a/dev-db/pgmecab/pgmecab-1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmecab/pgmecab-1.1.ebuild,v 1.2 2008/05/21 15:56:55 dev-zero Exp $
-
-DESCRIPTION="PostgreSQL function to Wakachigaki for Japanese words"
-HOMEPAGE="http://www.emaki.minidns.net/Programming/postgres/index.html"
-SRC_URI="http://www.emaki.minidns.net/Programming/postgres/${P}.tar.bz2"
-
-DEPEND="app-text/mecab
-	>=virtual/postgresql-server-7.4"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:^MECAB_CONFIG_PATH.*$:MECAB_CONFIG_PATH=/usr/bin/mecab-config:' Makefile
-}
-
-src_compile() {
-	make USE_PGXS=1
-}
-
-src_install() {
-	make DESTDIR=${D} USE_PGXS=1 install
-}