Version bumped. Added a patch to fix compilation error when nls USE flag is not set. Thanks to node <node@are-b.org> for a patch (bug #120068). Added a dep to pkg-config (bug #150803). Removed old ebuild.

(Portage version: 2.1.1)

5 files changed, 133 insertions, 2 deletions

diff --git a/x11-misc/macopix/ChangeLog b/x11-misc/macopix/ChangeLog
index 8284122d05d0..999bfab8ecaf 100644
--- a/x11-misc/macopix/ChangeLog
+++ b/x11-misc/macopix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/macopix
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/ChangeLog,v 1.12 2006/09/01 17:29:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/ChangeLog,v 1.13 2006/11/04 17:13:23 usata Exp $
+
+*macopix-1.4.1 (04 Nov 2006)
+
+  04 Nov 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/macopix-1.2.1-nls.diff, -macopix-1.0.4.ebuild,
+  macopix-1.2.1.ebuild, +macopix-1.4.1.ebuild:
+  Version bumped. Added a patch to fix compilation error when nls USE flag is
+  not set. Thanks to node <node@are-b.org> for a patch (bug #120068). Added a
+  dep to pkg-config (bug #150803). Removed old ebuild.
 
   01 Sep 2006; Stefan Schweizer <genstef@gentoo.org> macopix-1.0.4.ebuild,
   macopix-1.2.1.ebuild:
diff --git a/x11-misc/macopix/files/digest-macopix-1.4.1 b/x11-misc/macopix/files/digest-macopix-1.4.1
new file mode 100644
index 000000000000..4b9b63e735b2
--- /dev/null
+++ b/x11-misc/macopix/files/digest-macopix-1.4.1
@@ -0,0 +1,33 @@
+MD5 9f3e98919efa1b22bd126ec3854b43b7 macopix-1.4.1.tar.bz2 410837
+RMD160 34f6785933ac06bcc886e9e07f766f52e40dec0b macopix-1.4.1.tar.bz2 410837
+SHA256 ff11464656f688ac38dccec3ef10bf4ccde85abd050d2af7400952c9d14b17f3 macopix-1.4.1.tar.bz2 410837
+MD5 946361c9ff87b1d2ac5df2649fb2c3ac macopix-mascot-HxB-euc-ja-0.10.tar.gz 508852
+RMD160 8e82f60404b8d5f13c752bc204df3af634e27202 macopix-mascot-HxB-euc-ja-0.10.tar.gz 508852
+SHA256 3e494ade3ffc70b766ff6fcfec4eb81451893f8e253eda64aae10bd1c1b9c50f macopix-mascot-HxB-euc-ja-0.10.tar.gz 508852
+MD5 5d201590edec5ddaef30c55565c3dfed macopix-mascot-comic_party-ja-1.00.tar.gz 19101
+RMD160 7ab45c6e4e34315f7744e9601060bcac25c184d5 macopix-mascot-comic_party-ja-1.00.tar.gz 19101
+SHA256 62f17672ad7d79a1d2f5d38f41450fb1557655fc28f400c74d3075291df4c378 macopix-mascot-comic_party-ja-1.00.tar.gz 19101
+MD5 ae1aefbd5f6135a9273311e299ff2055 macopix-mascot-cosmos-ja-1.00.tar.gz 332026
+RMD160 f35cd486cdacbc171b9f7982e81de9428a66d5e8 macopix-mascot-cosmos-ja-1.00.tar.gz 332026
+SHA256 f4f3c2046f986dd28ba2e042418c0c73a3d16de3f23c302fbb62640ac12901b1 macopix-mascot-cosmos-ja-1.00.tar.gz 332026
+MD5 a11e381fcb70eb7c30e35c654f1ca816 macopix-mascot-kanon-ja-1.00.tar.gz 454361
+RMD160 6bba9308bc0bd7dd615fb57709805215355491e9 macopix-mascot-kanon-ja-1.00.tar.gz 454361
+SHA256 4e2224e73c61f845df58a1dc86e0240fc0c6908ecc913c255db6970b5b262e36 macopix-mascot-kanon-ja-1.00.tar.gz 454361
+MD5 075b229ca16d7778eddd61c1ff1db29f macopix-mascot-marimite-euc-ja-2.20.tar.gz 916260
+RMD160 2484692ae1262c251de09ffaef0351ddc9cf3494 macopix-mascot-marimite-euc-ja-2.20.tar.gz 916260
+SHA256 dd64c0834032dd37b83dc5f660dc813fcb0c514f3331f942afc61ff483126418 macopix-mascot-marimite-euc-ja-2.20.tar.gz 916260
+MD5 f53b7011f254c091ab412b6b262d88e6 macopix-mascot-mizuiro-ja-1.00.tar.gz 183981
+RMD160 ea3ad37c005dc43f086dcb825ae06f05b23799c6 macopix-mascot-mizuiro-ja-1.00.tar.gz 183981
+SHA256 682c873cdd8d864e424c3630f776983f8c6c10b601bc7b608c064d278badab31 macopix-mascot-mizuiro-ja-1.00.tar.gz 183981
+MD5 fd69540710a4a2d602cc5c8629dba9f9 macopix-mascot-one-ja-1.00.tar.gz 207463
+RMD160 bd772cff72265783c0cdca63667aa45090ee5071 macopix-mascot-one-ja-1.00.tar.gz 207463
+SHA256 8367164e1c2581136b717507739323db2ca54f76e2afe188dde82ddf1b076e2a macopix-mascot-one-ja-1.00.tar.gz 207463
+MD5 856a6ecdd08f7be8d3d24d4ca56c1ee2 macopix-mascot-pia2-ja-1.00.tar.gz 187213
+RMD160 2fc201a1792e080948390ad1745467923ef2d020 macopix-mascot-pia2-ja-1.00.tar.gz 187213
+SHA256 1612033fe3f1bb2ac6c3e9f1b1c97d9a0897ada366c6366354e2ad13d52b1f7c macopix-mascot-pia2-ja-1.00.tar.gz 187213
+MD5 67248bb1836a29b760bc4297a5ea3fd1 macopix-mascot-triangle_heart-ja-1.00.tar.gz 304526
+RMD160 1e0b8b77d19c4f8a6e8f6058b981e35ee0d1df14 macopix-mascot-triangle_heart-ja-1.00.tar.gz 304526
+SHA256 11f081c487ea8d319f086894b7273135e4342502fb1dd1cc3749dccf2f7fd5d7 macopix-mascot-triangle_heart-ja-1.00.tar.gz 304526
+MD5 aa41c71fec3b2842ff7699cbfa6dc5dd macopix-mascot-tsukihime-ja-1.00.tar.gz 604261
+RMD160 70b486c505f42fe9829c1e776f804e1dc1e94201 macopix-mascot-tsukihime-ja-1.00.tar.gz 604261
+SHA256 ebdcf55b5b25af4a278f09ea0f08222e21e8fce7650311bc9e0c852b1881e480 macopix-mascot-tsukihime-ja-1.00.tar.gz 604261
diff --git a/x11-misc/macopix/files/macopix-1.2.1-nls.diff b/x11-misc/macopix/files/macopix-1.2.1-nls.diff
new file mode 100644
index 000000000000..262037a80bc4
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-1.2.1-nls.diff
@@ -0,0 +1,17 @@
+--- src/main.c.orig	2006-10-06 06:20:26.000000000 +0900
++++ src/main.c	2006-11-05 02:03:50.000000000 +0900
+@@ -3647,12 +3647,14 @@
+   callbacks_arg_init();
+ 
+   // GetText
++#ifdef ENABLE_NLS
+   setlocale (LC_ALL, "");
+   bindtextdomain (PACKAGE, LOCALEDIR);
+   textdomain (PACKAGE);
+ #ifdef USE_GTK2
+   bind_textdomain_codeset(PACKAGE, "UTF-8");
+ #endif
++#endif
+ 
+   while(i_opt < argc) {
+     if((strcmp(argv[i_opt],"--message") == 0)){
diff --git a/x11-misc/macopix/macopix-1.2.1.ebuild b/x11-misc/macopix/macopix-1.2.1.ebuild
index 88fad18e49ec..664469e69d13 100644
--- a/x11-misc/macopix/macopix-1.2.1.ebuild
+++ b/x11-misc/macopix/macopix-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.2.1.ebuild,v 1.6 2006/09/01 17:29:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.2.1.ebuild,v 1.7 2006/11/04 17:13:23 usata Exp $
 
 inherit eutils
 
@@ -29,12 +29,14 @@ IUSE="nls"
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=dev-libs/glib-2.0.0
 	nls? ( >=sys-devel/gettext-0.10 )
+	dev-util/pkgconfig
 	media-libs/libpng"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-nls.diff
 }
 
 src_compile() {
diff --git a/x11-misc/macopix/macopix-1.4.1.ebuild b/x11-misc/macopix/macopix-1.4.1.ebuild
new file mode 100644
index 000000000000..e56a4c7d45df
--- /dev/null
+++ b/x11-misc/macopix/macopix-1.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.4.1.ebuild,v 1.1 2006/11/04 17:13:23 usata Exp $
+
+inherit eutils
+
+DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application on UNIX / X Window system."
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+
+BASE_URI="http://rosegray.sakura.ne.jp/macopix"
+SRC_URI="${BASE_URI}/${P}.tar.bz2"
+
+# NOTE: These mascots are not redistributable on commercial CD-ROM.
+# The author granted to use them under Gentoo Linux.
+MY_MASCOTS="macopix-mascot-cosmos-ja-1.00
+	macopix-mascot-mizuiro-ja-1.00
+	macopix-mascot-pia2-ja-1.00
+	macopix-mascot-tsukihime-ja-1.00
+	macopix-mascot-triangle_heart-ja-1.00
+	macopix-mascot-comic_party-ja-1.00
+	macopix-mascot-kanon-ja-1.00
+	macopix-mascot-one-ja-1.00
+	macopix-mascot-marimite-euc-ja-2.20
+	macopix-mascot-HxB-euc-ja-0.10"
+for i in ${MY_MASCOTS} ; do
+	SRC_URI="${SRC_URI} ${BASE_URI}/${i}.tar.gz"
+done
+
+# programme itself is GPL-2, and mascots are free-noncomm
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="nls"
+
+DEPEND=">=x11-libs/gtk+-2.0.0
+	>=dev-libs/glib-2.0.0
+	nls? ( >=sys-devel/gettext-0.10 )
+	dev-util/pkgconfig
+	media-libs/libpng"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.2.1-nls.diff
+}
+
+src_compile() {
+	econf --with-gtk2 \
+		$(use_enable nls) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS ChangeLog* NEWS *README*
+
+	# install mascots
+	for d in ${MY_MASCOTS} ; do
+		cd ${WORKDIR}/${d/-1.00/}
+		insinto /usr/share/${PN}
+		# please ignore doins errors ...
+		doins *.mcpx *.menu
+		insinto /usr/share/${PN}/pixmap
+		doins *.png
+		docinto $d
+		dodoc README.jp
+	done
+}