Fixed rpath security issue, bug #246953. Fixed LICENSE. Added ~amd64. Added unicode and vim-syntax USE flags. Clean up.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27-gentoo-r4 x86_64

6 files changed, 99 insertions, 76 deletions

diff --git a/app-text/cmigemo/ChangeLog b/app-text/cmigemo/ChangeLog
index 113335b4b2cb..0a0691817460 100644
--- a/app-text/cmigemo/ChangeLog
+++ b/app-text/cmigemo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/cmigemo
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/ChangeLog,v 1.15 2007/12/25 16:55:08 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/ChangeLog,v 1.16 2008/12/17 15:28:04 matsuu Exp $
+
+*cmigemo-1.3c-r1 (17 Dec 2008)
+
+  17 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> metadata.xml,
+  -cmigemo-1.2.ebuild, cmigemo-1.3c.ebuild, +cmigemo-1.3c-r1.ebuild:
+  Fixed rpath security issue, bug #246953. Fixed LICENSE. Added ~amd64.
+  Added unicode and vim-syntax USE flags. Clean up.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931. Assigning to maintainer-needed.
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
index e4efa9f42223..7fab08ad0353 100644
--- a/app-text/cmigemo/Manifest
+++ b/app-text/cmigemo/Manifest
@@ -1,7 +1,7 @@
 AUX cmigemo-1.2-migemo-dict.diff 825 RMD160 ab66cde1966d322be1a5b614471734e651ffcda2 SHA1 40ac11a31f1f670cacc709f184809268bbf3a7e9 SHA256 cacc1b65bf7041d9ff3628c1cc3c674ba5a210053addea8c4c3b122891455a84
-DIST cmigemo-1.2.tar.bz2 48359 RMD160 7733c53ff108f7fd360170917ae8b0afc5c8e7c6 SHA1 c11c1d0c41fa49a739eb637fae4dfced96bfebf0 SHA256 5db34f9fcf7537523a2fc8bc4b075b1c49dbd4ee5eb987ae86cc1b34a71f105f
+DIST cmigemo-1.3c-MIT.tar.bz2 54447 RMD160 0c771867ca9fbe1dd711dbf0f3624edfd2983588 SHA1 4da5c9eb30a9bb54a3e31067b624c36fa8ef742b SHA256 1923882f420aca97d726161ac532491419debd2b746506b1c0ce4fc1dfc79fb6
 DIST cmigemo-1.3c.tar.bz2 54323 RMD160 2f10e681e6ab20601c5fa830ecfd3ce68fd15b5c SHA1 39cc8250bc8cc5734fcf679ec39eed474e38e4f1 SHA256 d42fc98e062ff88886b3133905fa540ae41694fdd222ac0b88433046a9b6de59
-EBUILD cmigemo-1.2.ebuild 1597 RMD160 bc370586b0d2408680619c028be9f4d4b4416e9c SHA1 a3f5724a3f0cce49bca24e4c9fa7ee9cb2bc6f45 SHA256 6663112143fc1239c76d3fd99d7125994f7e460b65abf5224adf6cbe83b8d918
-EBUILD cmigemo-1.3c.ebuild 1636 RMD160 b66eac0d0054730ccaf6a53e7faa7f0fc0655397 SHA1 ca11f0389bcb9887c499708f13539ef76db88361 SHA256 99c8e5d95c08b5d49be15af10675850d315e7ecf0b9765f88af243ee8c080d38
-MISC ChangeLog 2170 RMD160 199fb1e67a1d3c667216e56a1e95df7d2f199fee SHA1 c2d155715fa8827035ab0cecfae0e3ebf04434d1 SHA256 e9517dc69ee97ddbc19842b3efd0ac47960fb4a26df6fb145425d83707aa655e
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+EBUILD cmigemo-1.3c-r1.ebuild 2026 RMD160 af8ce0d82eb9922db1e787a1ed45af4337a229db SHA1 7020236c72288ed97016ccc951f785f854bc04f8 SHA256 25c6d254297a4dfec78bb0052fcbad637dbae819f0a2248f75ab6afa17682de9
+EBUILD cmigemo-1.3c.ebuild 1713 RMD160 0b21e88779eaea1ad247af6d5a9d34c196055302 SHA1 a2b74cc8a0910c8726908cfc20f53c2fff814989 SHA256 53f5f6a5754232410c3c04cd359e4c32ad1396dffa9c5b5e0e19532560981295
+MISC ChangeLog 2459 RMD160 ef6bd4829a34f0d0b0f74b40f77f85b92183e3de SHA1 96059e5d5249238eba232589d412c1911cbb37e2 SHA256 7397a0277213acdfa7653bec9659ada38813678281cd243e3bbbda23d5c6f8f2
+MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
diff --git a/app-text/cmigemo/cmigemo-1.2.ebuild b/app-text/cmigemo/cmigemo-1.2.ebuild
deleted file mode 100644
index d1d2a59e2d8e..000000000000
--- a/app-text/cmigemo/cmigemo-1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/cmigemo-1.2.ebuild,v 1.10 2007/01/28 05:40:41 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="C/Migemo -- Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/${P}.tar.bz2"
-
-LICENSE="cmigemo"
-SLOT="0"
-KEYWORDS="x86 alpha ppc"
-IUSE="emacs"
-
-DEPEND="virtual/libc
-	app-i18n/qkc
-	app-dicts/migemo-dict"
-RDEPEND="virtual/libc
-	app-dicts/migemo-dict
-	emacs? ( >=app-text/migemo-0.40-r1 )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-migemo-dict.diff
-	touch ${S}/dict/SKK-JISYO.L
-}
-
-src_compile() {
-	emake CFLAGS="-fPIC ${CFLAGS}" gcc || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		docdir=${D}/usr/share/doc/${P} \
-		gcc-install || die
-
-	mv ${D}/usr/share/migemo/euc-jp/*.dat ${D}/usr/share/migemo
-	rm -rf ${D}/usr/share/migemo/{cp932,euc-jp}
-
-	if has_version 'app-editors/vim-core' ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins tools/migemo.vim
-	fi
-
-	dodoc tools/migemo.vim
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
new file mode 100644
index 000000000000..9ae2d96eb751
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/cmigemo-1.3c-r1.ebuild,v 1.1 2008/12/17 15:28:04 matsuu Exp $
+
+EAPI=2
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_P="${P}-MIT"
+DESCRIPTION="C/Migemo -- Migemo library implementation in C"
+HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
+SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="emacs unicode vim-syntax"
+
+DEPEND="dev-lang/perl
+	>=app-dicts/migemo-dict-200812[unicode=]
+	app-i18n/qkc"
+RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]
+	emacs? ( >=app-text/migemo-0.40-r1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2-migemo-dict.diff"
+	touch dict/SKK-JISYO.L
+	if use unicode ; then
+		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+	fi
+
+	# Bug #246953
+	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
+}
+
+src_compile() {
+	append-flags -fPIC
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" gcc || die
+}
+
+src_install() {
+	# parallel make install borks
+	emake -j1 \
+		prefix="${D}/usr" \
+		libdir="${D}/usr/$(get_libdir)" \
+		gcc-install || die
+
+	local encoding
+	if use unicode ; then
+		encoding="utf-8"
+	else
+		encoding="euc-jp"
+	fi
+
+	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/"
+	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins tools/migemo.vim
+	fi
+
+	dodoc doc/{README_j,TODO_j,vimigemo}.txt
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elog
+		elog "Please add to your ~/.emacs"
+		elog "    (setq migemo-command \"cmigemo\")"
+		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
+		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
+		elog "    (setq migemo-user-dictionary nil)"
+		elog "    (setq migemo-regex-dictionary nil)"
+		elog "to use cmigemo instead of migemo under emacs."
+		elog
+	fi
+}
diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
index d8b18488ed99..ba2e5cb47b83 100644
--- a/app-text/cmigemo/cmigemo-1.3c.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/cmigemo-1.3c.ebuild,v 1.5 2007/01/28 05:40:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cmigemo/cmigemo-1.3c.ebuild,v 1.6 2008/12/17 15:28:04 matsuu Exp $
 
 inherit eutils
 
@@ -25,6 +25,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.2-migemo-dict.diff
 	touch ${S}/dict/SKK-JISYO.L
+
+	# Bug #246953
+	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
 }
 
 src_compile() {
diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml
index 9f3fdee2246b..aef01fc3d591 100644
--- a/app-text/cmigemo/metadata.xml
+++ b/app-text/cmigemo/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+	<herd>cjk</herd>
 </pkgmetadata>