Fixed dependency, bug #247009. Removed old version.

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

5 files changed, 10 insertions, 61 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/Manifest b/dev-db/pgmecab/Manifest
index 9d79d0538dca..ddd193912e04 100644
--- a/dev-db/pgmecab/Manifest
+++ b/dev-db/pgmecab/Manifest
@@ -1,8 +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
 AUX pgmecab-1.1-r3-postgres83.patch 683 RMD160 1b584ef4dec657908481899230dcde169261ee83 SHA1 d7e685f4e7e39c44c0ed18dd42aefb9108a6b218 SHA256 39557e07f0356b8bf919eb088fb475aa670d4b6ad8c58ae57b9b4cc362210942
 DIST pgmecab-1.1.tar.bz2 9388 RMD160 9207e2e12dadb6893dde907a09eb8e9776ba6fb9 SHA1 4f7cf2a3e66c4893237ee3fa2ebc1ee37222918f SHA256 fd300f4fa65232a7c4e9ec0637677fb042378073c78561295c84131246a94105
-EBUILD pgmecab-1.1-r2.ebuild 824 RMD160 13c2b3c61d8a3d28884e8d42bcfa5932a4432960 SHA1 b19edc786c41d4bc6c863020e2f06c106d15c6e2 SHA256 9b7c26b4b8713d7281b682fde27024266e67716e8b244fac54c7e0f00c98ef43
-EBUILD pgmecab-1.1-r3.ebuild 1091 RMD160 ca8330506241aa767ce778c9c54a484ddfa21f5e SHA1 c7f0a231f52a248c866ff43560407646b022895b SHA256 b44934f99ccab21ce34906f1de82597841877b8fc28873776401bfc680dd7392
-MISC ChangeLog 1145 RMD160 44d1c1c4f80a2f2ef06d55761bcd4f0ebd500940 SHA1 daed5f12096628764792942c1136cd9220db1e25 SHA256 d1016a4ce7b03fef2d40087043ea60e8dfbc3748f4279099320c697944537746
+EBUILD pgmecab-1.1-r3.ebuild 1114 RMD160 0111f5ef9d8ab984afe63f0bdd64d50a6975ebe7 SHA1 7c34a63278131e4a513f8100dbf4fffa669f29e5 SHA256 273781f34a52cbf8767aef95f38a9b3b89b83bce64b6d1ccc1a5c1c43d5db1c7
+MISC ChangeLog 1337 RMD160 895e3fc1a999cce6d52fd8030192431fc01a44c2 SHA1 5717b0b80bf6ae8402fef69516d45d9c32bac2a9 SHA256 11617a1fe55ff92ef9bef31b280458f60f5322300b31a88fb593ddff73842b40
 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
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"