Fixed wrong install directory, bug #170346.

Package-Manager: portage-2.1.2.2

8 files changed, 26 insertions, 77 deletions

diff --git a/app-i18n/scim-tomoe/ChangeLog b/app-i18n/scim-tomoe/ChangeLog
index f7b92e5d6f9a..2b39a19a8b6d 100644
--- a/app-i18n/scim-tomoe/ChangeLog
+++ b/app-i18n/scim-tomoe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim-tomoe
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/ChangeLog,v 1.4 2007/01/06 05:57:19 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/ChangeLog,v 1.5 2007/03/12 00:15:13 matsuu Exp $
+
+*scim-tomoe-0.5.0-r1 (12 Mar 2007)
+
+  12 Mar 2007; MATSUU Takuto <matsuu@gentoo.org> -scim-tomoe-0.2.0.ebuild,
+  -scim-tomoe-0.3.0.ebuild, -scim-tomoe-0.5.0.ebuild,
+  +scim-tomoe-0.5.0-r1.ebuild:
+  Fixed wrong install directory, bug #170346.
 
 *scim-tomoe-0.5.0 (06 Jan 2007)
 
diff --git a/app-i18n/scim-tomoe/Manifest b/app-i18n/scim-tomoe/Manifest
index 14a14fc55205..06ed3e79fac0 100644
--- a/app-i18n/scim-tomoe/Manifest
+++ b/app-i18n/scim-tomoe/Manifest
@@ -1,40 +1,24 @@
-DIST scim-tomoe-0.2.0.tar.gz 500103 RMD160 0d0a2662b227851804c50cb902260cb02d6930a3 SHA1 51cde39dd2f0c0d0f824fe4c928400371fd13095 SHA256 68c1f60b1207f6436c707f8deff109bd963e2defbf0759e55b35a75fd9df9d93
-DIST scim-tomoe-0.3.0.tar.gz 505785 RMD160 e487350034119090a408969952003343a9e6ad31 SHA1 7fa5d6fb2d94d9c87e6cc8432a2bf74d0a5fd44f SHA256 1ec243051342c804412a9b26e76147a2752c24e8473f9bbd9e84d301e24072a7
 DIST scim-tomoe-0.4.0.tar.gz 505168 RMD160 e09595c9c0e0d51d63bef0387df3db67ec4afcce SHA1 b3846d6447b68d1c8dba0685c5d2eb332ac3f71f SHA256 797e71c482dd7b56ebc1a1c3aa97a568b11974dcc8afb0e4a5a9d5a623738650
 DIST scim-tomoe-0.5.0.tar.gz 506966 RMD160 793535393171c36b86ab9bac5763b1c3f44ab2df SHA1 81d81c093ac9f9996f998e2cebeea7d835bc82bd SHA256 9523a34006aab3b8a005dcef2e9f5c2bbc35d66363bd60cd8dcc3bd4b1f56a41
-EBUILD scim-tomoe-0.2.0.ebuild 710 RMD160 57acce2ac7471276766bff9aab47dd29a2838915 SHA1 67334ca5ec4c7e1cb5b537940497d18e9962a100 SHA256 bdcdb48828a94cd7b4d7b61daf479d0b7763366a58b2811356432eb65436023b
-MD5 06890b8149feaab709840753913e4bbf scim-tomoe-0.2.0.ebuild 710
-RMD160 57acce2ac7471276766bff9aab47dd29a2838915 scim-tomoe-0.2.0.ebuild 710
-SHA256 bdcdb48828a94cd7b4d7b61daf479d0b7763366a58b2811356432eb65436023b scim-tomoe-0.2.0.ebuild 710
-EBUILD scim-tomoe-0.3.0.ebuild 710 RMD160 38676b7c8942675e06dbe8e239af9e23560f5567 SHA1 088a573b38c5d2ba6ea2d86d8a0639c6247a71a1 SHA256 74d6d89dd53cf5511f939b4e1e5e1f550452e57c1b281b5e2ace2b96208c8a15
-MD5 d8fbd3e672aa15a9211d6b49abfac89a scim-tomoe-0.3.0.ebuild 710
-RMD160 38676b7c8942675e06dbe8e239af9e23560f5567 scim-tomoe-0.3.0.ebuild 710
-SHA256 74d6d89dd53cf5511f939b4e1e5e1f550452e57c1b281b5e2ace2b96208c8a15 scim-tomoe-0.3.0.ebuild 710
 EBUILD scim-tomoe-0.4.0.ebuild 710 RMD160 47ba90bc02f5327c9b5a5b70bc9216e34cd8616e SHA1 97a0113bea3354126b15529e4ac2072898e43c75 SHA256 7d6c41977647cd84d2e30b70aae27b51341940e8d4b54892b31998302ef89c67
 MD5 d1a06e67216bb29c7a5cf62d50c4213c scim-tomoe-0.4.0.ebuild 710
 RMD160 47ba90bc02f5327c9b5a5b70bc9216e34cd8616e scim-tomoe-0.4.0.ebuild 710
 SHA256 7d6c41977647cd84d2e30b70aae27b51341940e8d4b54892b31998302ef89c67 scim-tomoe-0.4.0.ebuild 710
-EBUILD scim-tomoe-0.5.0.ebuild 710 RMD160 3b01cd8bbf55985b7934b96a4ec78fe5536f6190 SHA1 497517638d9c8edf5fb08946331814553cc46279 SHA256 f5b801f6b7c45faed615c3ee2e421a80f1c3cb34337e3822044634abf7a074e3
-MD5 9eeb7d6ef5ccef56dbb7ee056db8aefc scim-tomoe-0.5.0.ebuild 710
-RMD160 3b01cd8bbf55985b7934b96a4ec78fe5536f6190 scim-tomoe-0.5.0.ebuild 710
-SHA256 f5b801f6b7c45faed615c3ee2e421a80f1c3cb34337e3822044634abf7a074e3 scim-tomoe-0.5.0.ebuild 710
-MISC ChangeLog 776 RMD160 6036d293b603ad5742fc856beb306fdf45d94da6 SHA1 613059a53af8b977902c36186416a82b6ebf1fd4 SHA256 a5ee4c11d3f576da86c599a90e3da64f13243a7a093ba02c05d7a6752087b957
-MD5 935cf5789309b96e6e7516bbce1d5924 ChangeLog 776
-RMD160 6036d293b603ad5742fc856beb306fdf45d94da6 ChangeLog 776
-SHA256 a5ee4c11d3f576da86c599a90e3da64f13243a7a093ba02c05d7a6752087b957 ChangeLog 776
+EBUILD scim-tomoe-0.5.0-r1.ebuild 859 RMD160 06ae0653682a9c89048b6768cf1fee1a3acbe312 SHA1 cc04c90c9e4488d71253863b4898962a82e5440e SHA256 176eeecbe6f71b5e3568d6a6cf0d772d3ea93909854fcf265e9ee14a2120b3bc
+MD5 2f34958c256721d7439b2a1f9da3c6a9 scim-tomoe-0.5.0-r1.ebuild 859
+RMD160 06ae0653682a9c89048b6768cf1fee1a3acbe312 scim-tomoe-0.5.0-r1.ebuild 859
+SHA256 176eeecbe6f71b5e3568d6a6cf0d772d3ea93909854fcf265e9ee14a2120b3bc scim-tomoe-0.5.0-r1.ebuild 859
+MISC ChangeLog 1019 RMD160 679037f5491ca42dc5d9968a976d6159549bf927 SHA1 ae5e66a92bd1b11eedaa782b701b0200b1727f70 SHA256 9e969ae85f6f0454e8e9c7c89119faf9bf02b41fe200be371e159e9931c9dbcc
+MD5 418f091f0d64830ea87606d65202dab1 ChangeLog 1019
+RMD160 679037f5491ca42dc5d9968a976d6159549bf927 ChangeLog 1019
+SHA256 9e969ae85f6f0454e8e9c7c89119faf9bf02b41fe200be371e159e9931c9dbcc ChangeLog 1019
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
 MD5 5a9deb1f29e94497a4ec6ccca8ccdeb3 metadata.xml 157
 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 metadata.xml 157
 SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89 metadata.xml 157
-MD5 9d527d11b3cf7a95947f30ca61be3dc7 files/digest-scim-tomoe-0.2.0 250
-RMD160 1b8cb66545dc2d6e284967452618ea290352e3ee files/digest-scim-tomoe-0.2.0 250
-SHA256 bb352ccbeff88176db4c97f81e0cbd6ef5577a9a28c1b74a2a51e8d5f56f91db files/digest-scim-tomoe-0.2.0 250
-MD5 ee00b439f6ad25ca5385e5b7a97ed912 files/digest-scim-tomoe-0.3.0 250
-RMD160 42a6ff042e78732db4030a1e1a25dc096f7d8a8b files/digest-scim-tomoe-0.3.0 250
-SHA256 9cb21ec713c55aaf0bdd8eddb5a11bca6e27d013415fbff3133666641510f773 files/digest-scim-tomoe-0.3.0 250
 MD5 4a370c3d5b7bad14566da2653f11ae33 files/digest-scim-tomoe-0.4.0 250
 RMD160 367c794563a87f90f8a13b435b22e8640bc91ea7 files/digest-scim-tomoe-0.4.0 250
 SHA256 4af3e9785ecfdba0f8ecf6b8d04a30d60538b6c180f0029e78749c72cf6e0439 files/digest-scim-tomoe-0.4.0 250
-MD5 694984ec23eada408c624a7b98254fd8 files/digest-scim-tomoe-0.5.0 250
-RMD160 ba4f9a3034068f1cb087b30a280c854ddec84b32 files/digest-scim-tomoe-0.5.0 250
-SHA256 eda5e4f98b5cd6b4c6b30522f11721713ec9de76124c694c3c68e631e67a6917 files/digest-scim-tomoe-0.5.0 250
+MD5 694984ec23eada408c624a7b98254fd8 files/digest-scim-tomoe-0.5.0-r1 250
+RMD160 ba4f9a3034068f1cb087b30a280c854ddec84b32 files/digest-scim-tomoe-0.5.0-r1 250
+SHA256 eda5e4f98b5cd6b4c6b30522f11721713ec9de76124c694c3c68e631e67a6917 files/digest-scim-tomoe-0.5.0-r1 250
diff --git a/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.2.0 b/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.2.0
deleted file mode 100644
index fea44322b9e5..000000000000
--- a/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 55bc028af137ed5f99bab4ca042219cf scim-tomoe-0.2.0.tar.gz 500103
-RMD160 0d0a2662b227851804c50cb902260cb02d6930a3 scim-tomoe-0.2.0.tar.gz 500103
-SHA256 68c1f60b1207f6436c707f8deff109bd963e2defbf0759e55b35a75fd9df9d93 scim-tomoe-0.2.0.tar.gz 500103
diff --git a/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.3.0 b/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.3.0
deleted file mode 100644
index 318c2dc05af8..000000000000
--- a/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8f34a77d31ecb17767a7c6919a8a2d2c scim-tomoe-0.3.0.tar.gz 505785
-RMD160 e487350034119090a408969952003343a9e6ad31 scim-tomoe-0.3.0.tar.gz 505785
-SHA256 1ec243051342c804412a9b26e76147a2752c24e8473f9bbd9e84d301e24072a7 scim-tomoe-0.3.0.tar.gz 505785
diff --git a/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.5.0 b/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.5.0-r1
index 39bdf656b2e0..39bdf656b2e0 100644
--- a/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.5.0
+++ b/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.5.0-r1
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.2.0.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.2.0.ebuild
deleted file mode 100644
index 14045fa8b53e..000000000000
--- a/app-i18n/scim-tomoe/scim-tomoe-0.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/scim-tomoe-0.2.0.ebuild,v 1.1 2006/08/12 02:56:51 matsuu Exp $
-
-DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
-HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMTomoe"
-SRC_URI="mirror://sourceforge.jp/scim-imengine/17173/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )
-	>=app-i18n/libtomoe-gtk-0.1.0"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.3.0.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.3.0.ebuild
deleted file mode 100644
index f613af0ff358..000000000000
--- a/app-i18n/scim-tomoe/scim-tomoe-0.3.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/scim-tomoe-0.3.0.ebuild,v 1.1 2006/11/04 06:38:57 matsuu Exp $
-
-DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
-HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMTomoe"
-SRC_URI="mirror://sourceforge.jp/scim-imengine/22492/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )
-	>=app-i18n/libtomoe-gtk-0.1.0"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.5.0.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild
index 076755684cb1..7c20230d82d3 100644
--- a/app-i18n/scim-tomoe/scim-tomoe-0.5.0.ebuild
+++ b/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.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/scim-tomoe/scim-tomoe-0.5.0.ebuild,v 1.1 2007/01/06 05:57:19 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild,v 1.1 2007/03/12 00:15:13 matsuu Exp $
 
 DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
 HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMTomoe"
@@ -14,6 +14,12 @@ IUSE=""
 DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )
 	>=app-i18n/libtomoe-gtk-0.4.0"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e '/^moduledir = /s/`pkg-config --variable=scim_binary_version scim`\///' src/Makefile* || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"