Fixed dependency, bug #247009. Removed old version.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64)

4 files changed, 8 insertions, 57 deletions

diff --git a/dev-db/pgmecab/ChangeLog b/dev-db/pgmecab/ChangeLog
index 61f76742f58e..d8c99f51fdd5 100644
--- a/dev-db/pgmecab/ChangeLog
+++ b/dev-db/pgmecab/ChangeLog
@@ -1,6 +1,11 @@
 # 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.5 2008/11/15 00:03:50 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmecab/ChangeLog,v 1.6 2008/11/16 06:29:43 matsuu Exp $
+
+  16 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/pgmecab-1.1-postgres83.patch, -pgmecab-1.1-r2.ebuild,
+  pgmecab-1.1-r3.ebuild:
+  Fixed dependency, bug #247009. Removed old version.
 
 *pgmecab-1.1-r3 (15 Nov 2008)
 
diff --git a/dev-db/pgmecab/files/pgmecab-1.1-postgres83.patch b/dev-db/pgmecab/files/pgmecab-1.1-postgres83.patch
deleted file mode 100644
index 30d2e87a8e2f..000000000000
--- a/dev-db/pgmecab/files/pgmecab-1.1-postgres83.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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-r2.ebuild b/dev-db/pgmecab/pgmecab-1.1-r2.ebuild
deleted file mode 100644
index ac7d91f144d3..000000000000
--- a/dev-db/pgmecab/pgmecab-1.1-r2.ebuild
+++ /dev/null
@@ -1,34 +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-r2.ebuild,v 1.1 2008/11/02 08:55:33 matsuu Exp $
-
-inherit eutils
-
-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"
-
-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}-postgres83.patch"
-}
-
-src_compile() {
-	emake USE_PGXS=1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" USE_PGXS=1 install || die
-
-	dodoc README.pgmecab
-}
diff --git a/dev-db/pgmecab/pgmecab-1.1-r3.ebuild b/dev-db/pgmecab/pgmecab-1.1-r3.ebuild
index c4ec361f7b6d..200246b6c018 100644
--- a/dev-db/pgmecab/pgmecab-1.1-r3.ebuild
+++ b/dev-db/pgmecab/pgmecab-1.1-r3.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-r3.ebuild,v 1.1 2008/11/15 00:03:50 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmecab/pgmecab-1.1-r3.ebuild,v 1.2 2008/11/16 06:29:43 matsuu Exp $
 
 inherit eutils versionator
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-text/mecab
-	>=virtual/postgresql-server-7.4"
+	>=dev-db/postgresql-server-7.4" # pgmecab requires PGXS
 DEPEND="${RDEPEND}
 	app-admin/eselect-postgresql"