Modified for removing conflict with www-client/kazehakase.

Package-Manager: portage-2.0.51.19

6 files changed, 309 insertions, 4 deletions

diff --git a/www-client/kazehakase-cvs/ChangeLog b/www-client/kazehakase-cvs/ChangeLog
index 004b56dbf964..d92496f3287b 100644
--- a/www-client/kazehakase-cvs/ChangeLog
+++ b/www-client/kazehakase-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/kazehakase-cvs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase-cvs/ChangeLog,v 1.3 2005/03/23 16:20:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase-cvs/ChangeLog,v 1.4 2005/03/25 16:32:09 nakano Exp $
+
+*kazehakase-cvs-20050325 (25 Mar 2005)
+
+  25 Mar 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/kazehakase-cvs-gentoo.patch, +kazehakase-cvs-20050325.ebuild:
+  Modified for removing conflict with www-client/kazehakase.
+  Ebuild submitted by Atzm Watanabe <sitosito@p.chan.ne.jp>
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   kazehakase-cvs-20050301.ebuild:
diff --git a/www-client/kazehakase-cvs/Manifest b/www-client/kazehakase-cvs/Manifest
index d5f01c186360..892993c51f23 100644
--- a/www-client/kazehakase-cvs/Manifest
+++ b/www-client/kazehakase-cvs/Manifest
@@ -1,4 +1,7 @@
+MD5 66b37b7e8bc5c57fa5290776e036881c kazehakase-cvs-20050325.ebuild 2640
 MD5 b2c29ea05ced9ceeb926b06478071050 kazehakase-cvs-20050301.ebuild 2193
+MD5 9657d25cd544de7e3758d31af092d9a2 ChangeLog 1019
 MD5 b6a70dc606d1eae980c96b5e81dd1e1b metadata.xml 249
-MD5 cfc4ee7383893282442c2ace1a3adb6c ChangeLog 736
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kazehakase-cvs-20050301 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kazehakase-cvs-20050325 0
+MD5 36fcc659d18eb3898bf744721cca0743 files/kazehakase-cvs-gentoo.patch 6798
diff --git a/www-client/kazehakase-cvs/files/digest-kazehakase-cvs-20050325 b/www-client/kazehakase-cvs/files/digest-kazehakase-cvs-20050325
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/www-client/kazehakase-cvs/files/digest-kazehakase-cvs-20050325
diff --git a/www-client/kazehakase-cvs/files/kazehakase-cvs-gentoo.patch b/www-client/kazehakase-cvs/files/kazehakase-cvs-gentoo.patch
new file mode 100644
index 000000000000..6f39353b4790
--- /dev/null
+++ b/www-client/kazehakase-cvs/files/kazehakase-cvs-gentoo.patch
@@ -0,0 +1,199 @@
+diff -Naur kazehakase-org/src/actions/kz-actions.c kazehakase/src/actions/kz-actions.c
+--- kazehakase-org/src/actions/kz-actions.c	2005-03-24 05:45:25.587573560 +0900
++++ kazehakase/src/actions/kz-actions.c	2005-03-24 05:15:02.000000000 +0900
+@@ -1286,7 +1286,7 @@
+ 						  dirname);
+ 
+ 	filename = g_strconcat(g_get_home_dir(),
+-			       "/.kazehakase/",
++			       "/.", PACKAGE, "/",
+ 			       dirname,
+ 			       "/",
+ 			       htmlname,
+@@ -1372,7 +1372,7 @@
+ 
+ 	/* reload from current session file */
+ 	current_session  = g_build_filename(g_get_home_dir(),
+-					    ".kazehakase",
++					    "."PACKAGE,
+ 					    "current_session.xml",
+ 					     NULL);
+ 	if (!g_file_test(current_session, G_FILE_TEST_EXISTS))
+diff -Naur kazehakase-org/src/kazehakase.h kazehakase/src/kazehakase.h
+--- kazehakase-org/src/kazehakase.h	2005-03-24 05:45:25.606570672 +0900
++++ kazehakase/src/kazehakase.h	2005-03-24 05:45:01.554227184 +0900
+@@ -36,8 +36,8 @@
+ 
+ #define KAZEHAKASE_URI "http://kazehakase.sourceforge.jp/"
+ 
+-#define HISTORY_INDEX "/.kazehakase/history_index "
+-#define HISTORY_DIR   "/.kazehakase/history/"
++#define HISTORY_INDEX "/."PACKAGE"/history_index "
++#define HISTORY_DIR   "/."PACKAGE"/history/"
+ 
+ 
+ typedef enum {
+diff -Naur kazehakase-org/src/kz-favicon.c kazehakase/src/kz-favicon.c
+--- kazehakase-org/src/kz-favicon.c	2005-03-24 05:45:25.617569000 +0900
++++ kazehakase/src/kz-favicon.c	2005-03-24 05:14:42.000000000 +0900
+@@ -97,7 +97,7 @@
+ 	KzFaviconPrivate *priv = KZ_FAVICON_GET_PRIVATE (kzfav);
+ 
+ 	favicon_file = g_build_filename(g_get_home_dir(),
+-				        ".kazehakase",
++				        "."PACKAGE,
+ 					"faviconrc",
+ 				   	NULL);
+ 	priv->uri_list = kz_profile_open(favicon_file, NULL);
+@@ -120,7 +120,7 @@
+ 	KzFaviconPrivate *priv = KZ_FAVICON_GET_PRIVATE (kzfav);
+ 	
+ 	favicon_file = g_build_filename(g_get_home_dir(),
+-				   	".kazehakase",
++				   	"."PACKAGE,
+ 					"faviconrc",
+ 				   	NULL);
+ 	
+@@ -357,7 +357,7 @@
+ 
+ 	favicon_filename = create_filename_from_uri(uri);
+ 	favicon_file_location = g_build_filename(g_get_home_dir(),
+-					    	 ".kazehakase",
++					    	 "."PACKAGE,
+ 						 "favicon",
+ 					    	 favicon_filename,
+ 					    	 NULL);
+diff -Naur kazehakase-org/src/kz-popup-preview.c kazehakase/src/kz-popup-preview.c
+--- kazehakase-org/src/kz-popup-preview.c	2005-03-24 05:45:25.547579640 +0900
++++ kazehakase/src/kz-popup-preview.c	2005-03-24 05:14:42.000000000 +0900
+@@ -503,7 +503,7 @@
+ 	tmp_name = egg_str_get_md5_str(uri);
+ 	image_name = g_strconcat(tmp_name, ".png", NULL);
+ 	popup_file_name = g_build_filename(g_get_home_dir(),
+-					   ".kazehakase",
++					   "."PACKAGE,
+ 					   "popup",
+ 					   image_name,
+ 					   NULL);
+diff -Naur kazehakase-org/src/kz-window.c kazehakase/src/kz-window.c
+--- kazehakase-org/src/kz-window.c	2005-03-24 05:45:25.557578120 +0900
++++ kazehakase/src/kz-window.c	2005-03-24 05:14:42.000000000 +0900
+@@ -766,7 +766,7 @@
+ 	case KZ_UI_LEVEL_CUSTOM:
+ 		action_str = "UILevelCustom";
+ 		ui_file = g_strconcat(g_get_home_dir(),
+-				      "/.kazehakase/kz-ui.xml",
++				      "/.", PACKAGE, "/kz-ui.xml",
+ 				      NULL);
+ 		break;
+ 	case KZ_UI_LEVEL_EXPERT:
+diff -Naur kazehakase-org/src/main.c kazehakase/src/main.c
+--- kazehakase-org/src/main.c	2005-03-24 05:45:25.585573864 +0900
++++ kazehakase/src/main.c	2005-03-24 05:14:42.000000000 +0900
+@@ -573,14 +573,15 @@
+ 
+ 	/* load prefs */
+ 	sysconf_file = g_strdup(KZ_SYSCONFDIR "/kzrc");
+-	conf_file = g_build_filename(g_get_home_dir(), ".kazehakase",
++	conf_file = g_build_filename(g_get_home_dir(),
++				     "."PACKAGE,
+ 				     "kzrc", NULL);
+ 	
+ 	kz_global_profile = kz_profile_open(conf_file, sysconf_file);
+ 
+ 	/* load bookmarks */
+ 	bookmark_file         = g_build_filename(g_get_home_dir(),
+-					    	 ".kazehakase",
++					    	 "."PACKAGE,
+ 					    	 "bookmarks.xml",
+ 					    	 NULL);
+ 	sys_bookmark_file     = g_build_filename(KZ_SYSCONFDIR,
+@@ -588,25 +589,25 @@
+ 					    	 NULL);
+ 
+         bookmark_bar_file     = g_build_filename(g_get_home_dir(),
+-					    	 ".kazehakase",
++					    	 "."PACKAGE,
+ 						 "bookmarkbar.xml",
+ 					    	 NULL);
+ 	sys_bookmark_bar_file = g_build_filename(KZ_SYSCONFDIR,
+ 					    	 "bookmarkbar.xml",
+ 					    	 NULL);
+ 	clip_file             = g_build_filename(g_get_home_dir(),
+-					    	 ".kazehakase",
++					    	 "."PACKAGE,
+ 						 "clip.xml",
+ 					    	 NULL);
+         smartbookmark_file    = g_build_filename(g_get_home_dir(),
+-					    	 ".kazehakase",
++					    	 "."PACKAGE,
+ 					    	 "smartbookmarks.xml",
+ 					    	 NULL);
+ 	sys_smartbookmark_file= g_build_filename(KZ_SYSCONFDIR,
+ 					    	 "smartbookmarks.xml",
+ 					    	 NULL);
+ 	current_session_file  = g_build_filename(g_get_home_dir(),
+-					    	 ".kazehakase",
++						 "."PACKAGE,
+ 						 "current_session.xml",
+ 					    	 NULL);
+ 	
+@@ -624,14 +625,14 @@
+ 
+ 	/* Load other prefs... */
+ 	accel_prefs_file = g_build_filename (g_get_home_dir(),
+-					     ".kazehakase",
++					     "."PACKAGE,
+ 					     "keyaccelrc",
+ 					     NULL);
+ 	gtk_accel_map_load (accel_prefs_file);
+ 
+ 	sysproxy_file = g_build_filename(KZ_SYSCONFDIR, "proxyrc", NULL);
+ 	proxy_file = g_build_filename (g_get_home_dir(),
+-				       ".kazehakase",
++				       "."PACKAGE,
+ 				       "proxyrc", NULL);
+ 	kz_proxy = kz_profile_open(proxy_file, sysproxy_file);
+ 
+@@ -674,7 +675,7 @@
+ 	gchar *accel_prefs_file;
+ 
+ 	accel_prefs_file = g_build_filename (g_get_home_dir(),
+-					     ".kazehakase",
++					     "."PACKAGE,
+ 					     "keyaccelrc",
+ 					     NULL);
+ 
+@@ -722,7 +723,7 @@
+ 
+ 	/* reload from current session file */
+ 	current_session  = g_build_filename(g_get_home_dir(),
+-					    ".kazehakase",
++					    "."PACKAGE,
+ 					    "current_session.xml",
+ 					     NULL);
+ 	if (!g_file_test(current_session, G_FILE_TEST_EXISTS))
+diff -Naur kazehakase-org/src/mozilla/kz-mozwrapper.cpp kazehakase/src/mozilla/kz-mozwrapper.cpp
+--- kazehakase-org/src/mozilla/kz-mozwrapper.cpp	2005-03-24 05:45:25.565576904 +0900
++++ kazehakase/src/mozilla/kz-mozwrapper.cpp	2005-03-24 05:15:30.000000000 +0900
+@@ -1260,7 +1260,7 @@
+ 		gchar *filename = create_filename_from_uri(uri);
+ 
+ 		dir = g_strconcat(g_get_home_dir(),
+-				  "/.kazehakase/",
++				  "/.", PACKAGE, "/",
+ 				  storedir, "/",
+ 				  type, /* images or css */ 
+ 				  "/",
+diff -Naur kazehakase-org/src/mozilla/mozilla-prefs.cpp kazehakase/src/mozilla/mozilla-prefs.cpp
+--- kazehakase-org/src/mozilla/mozilla-prefs.cpp	2005-03-24 05:45:25.564577056 +0900
++++ kazehakase/src/mozilla/mozilla-prefs.cpp	2005-03-24 05:15:41.000000000 +0900
+@@ -49,7 +49,7 @@
+ 	}
+ 
+ 	g_snprintf(full_path, G_N_ELEMENTS(full_path),
+-		   "%s/%s", home_path, ".kazehakase/mozilla");
++		   "%s/%s", home_path, "."PACKAGE"/mozilla");
+ 	gtk_moz_embed_set_profile_path(full_path, "kazehakase");
+ 
+ 	return TRUE;
diff --git a/www-client/kazehakase-cvs/kazehakase-cvs-20050325.ebuild b/www-client/kazehakase-cvs/kazehakase-cvs-20050325.ebuild
new file mode 100644
index 000000000000..36faef5dde8f
--- /dev/null
+++ b/www-client/kazehakase-cvs/kazehakase-cvs-20050325.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase-cvs/kazehakase-cvs-20050325.ebuild,v 1.1 2005/03/25 16:32:09 nakano Exp $
+
+inherit cvs eutils
+
+ECVS_BRANCH=""
+ECVS_SERVER="cvs.sourceforge.jp:/cvsroot/kazehakase"
+ECVS_USER="anonymous"
+ECVS_MODULE="kazehakase"
+
+DESCRIPTION="Kazehakase is a browser with gecko engine like Epiphany or Galeon."
+SRC_URI=""
+HOMEPAGE="http://kazehakase.sourceforge.jp/"
+IUSE="migemo estraier thumbnail"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+LICENSE="GPL-2"
+
+DEPEND=">=www-client/mozilla-1.7
+	x11-libs/pango
+	>=x11-libs/gtk+-2
+	dev-util/pkgconfig
+	net-misc/curl
+	migemo? ( || ( app-text/migemo app-text/cmigemo ) )
+	estraier? ( app-text/estraier )
+	thumbnail? ( virtual/ghostscript )
+	sys-devel/autoconf
+	sys-devel/automake"
+
+S="${WORKDIR}/${ECVS_MODULE}"
+
+pkg_setup(){
+	local moz_use="$(</var/db/pkg/`best_version www-client/mozilla`/USE)"
+
+	# >=www-client/mozilla-1.7.3-r2 always depend on gtk2.
+	if ! has_version '>=www-client/mozilla-1.7.3-r2' && ! has gtk2 ${moz_use}
+	then
+		echo
+		eerror
+		eerror "This needs mozilla used gtk2."
+		eerror "To build mozilla use gtk2, please type following command:"
+		eerror
+		eerror "    # USE=\"gtk2\" emerge mozilla"
+		eerror
+		die
+	fi
+}
+
+src_unpack(){
+	cvs_src_unpack || die
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gentoo.patch
+
+	mv configure.in configure.in.org
+	sed -e "s/\(AC_INIT(kazehakase\|GETTEXT_PACKAGE=kazehakase\)/\1-cvs/" \
+		configure.in.org > configure.in
+
+	mv data/Makefile.am data/Makefile.am.org
+	sed -e "s/^desktop_DATA = kazehakase.desktop/desktop_DATA = kazehakase-cvs.desktop/" \
+		data/Makefile.am.org > data/Makefile.am
+	mv data/kazehakase.desktop data/kazehakase-cvs.desktop
+}
+
+src_compile(){
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
+
+	./autogen.sh || die
+	econf `use_enable migemo` --program-suffix="-cvs" || die
+	emake || die
+}
+
+src_install(){
+	emake DESTDIR="${D}" install || die
+	dodoc ABOUT-NLS AUTHORS COPYING* ChangeLog NEWS README* TODO.ja
+}
+
+pkg_postinst(){
+	if use thumbnail; then
+		einfo "To enable thumbnail, "
+		einfo "   1. Go to Preference."
+		einfo "   2. Check \"Create thumbnail\"."
+		einfo
+		ewarn "Creating thumbnail process is still unstable (sometimes causes crash),"
+		ewarn "but most causes of unstability are Mozilla. If you find a crash bug on"
+		ewarn "Kazehakase, please confirm the following:"
+		ewarn
+		ewarn "   1. Load a crash page with Mozilla."
+		ewarn "   2. Print preview the page."
+		ewarn "   3. Close print preview window."
+		ewarn "   4. Print the page to a file."
+		ewarn
+	fi
+}
diff --git a/www-client/kazehakase/Manifest b/www-client/kazehakase/Manifest
index 9c960aaedfd6..7d3d22629210 100644
--- a/www-client/kazehakase/Manifest
+++ b/www-client/kazehakase/Manifest
@@ -1,5 +1,5 @@
-MD5 0479ea1f2b3d5e19f8da191fdaf9010e kazehakase-0.2.5.ebuild 2015
-MD5 32f1113aafde3c4b190268cf63192889 ChangeLog 7033
+MD5 3f6f647a2bcd2293c00ded5fe9135b74 kazehakase-0.2.5.ebuild 1966
+MD5 9d9a20497218ce886414c17830bc5aae ChangeLog 7188
 MD5 b6a70dc606d1eae980c96b5e81dd1e1b metadata.xml 249
 MD5 a1fae24dfd959af21c60cbaf95580fe6 kazehakase-0.2.2.ebuild 1836
 MD5 9e4124bb69947d4aa39dc0fdc3a7efd5 files/kazehakase-0.2.5-gentoo.patch 467