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)
 (Unsigned Manifest commit)

3 files changed, 22 insertions, 97 deletions

diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index b5ccc67e9650..489fb83bfb8f 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -2,37 +2,42 @@ AUX macopix-1.2.1-gentoo.diff 480 RMD160 501356d0b7c601ba2a7c8a05caf67fb34b1dec3
 MD5 6e587c290c184e6e8b620cf42123d5c7 files/macopix-1.2.1-gentoo.diff 480
 RMD160 501356d0b7c601ba2a7c8a05caf67fb34b1dec3d files/macopix-1.2.1-gentoo.diff 480
 SHA256 f6aa2cdf5f1965f73484d2ce115c96eb4b3041a907d91df40c3c8190e5d47891 files/macopix-1.2.1-gentoo.diff 480
-DIST macopix-1.0.4.tar.bz2 440812
+AUX macopix-1.2.1-nls.diff 438 RMD160 ceb15318cd130e0857297f5bc0d92ea18b8907bb SHA1 469846be92018b3890cd386e006ca2000b2a26af SHA256 919e61d956c6ba2d3447c20aa3789eec465490671e45fcf7722f309718ada041
+MD5 39e32a9527c891473c10653f77c624de files/macopix-1.2.1-nls.diff 438
+RMD160 ceb15318cd130e0857297f5bc0d92ea18b8907bb files/macopix-1.2.1-nls.diff 438
+SHA256 919e61d956c6ba2d3447c20aa3789eec465490671e45fcf7722f309718ada041 files/macopix-1.2.1-nls.diff 438
 DIST macopix-1.2.1.tar.bz2 457579 RMD160 710ee19bc49f04e7a81dcaf144f19499d1e30d3a SHA1 deb79d8afaceab757558ad2427a408f4e9896f3b SHA256 181d69f0ba7250fbc32ec760a29f734922ca4b04367652e505420071d64f96b5
+DIST macopix-1.4.1.tar.bz2 410837 RMD160 34f6785933ac06bcc886e9e07f766f52e40dec0b SHA1 e8dfbaebc82d65b27e2e79af5c93e83ad3a79b96 SHA256 ff11464656f688ac38dccec3ef10bf4ccde85abd050d2af7400952c9d14b17f3
+DIST macopix-mascot-HxB-euc-ja-0.10.tar.gz 508852 RMD160 8e82f60404b8d5f13c752bc204df3af634e27202 SHA1 daeb5a938aef75f8db0f4d8ee5b0b159000c8372 SHA256 3e494ade3ffc70b766ff6fcfec4eb81451893f8e253eda64aae10bd1c1b9c50f
 DIST macopix-mascot-comic_party-ja-1.00.tar.gz 19101 RMD160 7ab45c6e4e34315f7744e9601060bcac25c184d5 SHA1 e4e85a0716c93db4136ff99a88f004cdf73ab2f5 SHA256 62f17672ad7d79a1d2f5d38f41450fb1557655fc28f400c74d3075291df4c378
 DIST macopix-mascot-cosmos-ja-1.00.tar.gz 332026 RMD160 f35cd486cdacbc171b9f7982e81de9428a66d5e8 SHA1 8467268e1478da2d22ce1fbfa0f0ba149cc5fbe3 SHA256 f4f3c2046f986dd28ba2e042418c0c73a3d16de3f23c302fbb62640ac12901b1
 DIST macopix-mascot-kanon-ja-1.00.tar.gz 454361 RMD160 6bba9308bc0bd7dd615fb57709805215355491e9 SHA1 ace31165254c399b5e92555481134f7ddf0eaf84 SHA256 4e2224e73c61f845df58a1dc86e0240fc0c6908ecc913c255db6970b5b262e36
 DIST macopix-mascot-marimite-euc-ja-2.10.tar.gz 856124 RMD160 b8949a1b819a55e50b0762fb3d2222545e104bb6 SHA1 74c5df58c6b9a25fe808b88280c41f43cbde3941 SHA256 da2a8daed2540745f33f6f7b11ad135680298bd20708a4c83543dbcc5198a0cc
-DIST macopix-mascot-marimite-ja-1.20.tar.gz 788828
+DIST macopix-mascot-marimite-euc-ja-2.20.tar.gz 916260 RMD160 2484692ae1262c251de09ffaef0351ddc9cf3494 SHA1 366e99b0882aa6cc3cac283b9e77a9e5906efaab SHA256 dd64c0834032dd37b83dc5f660dc813fcb0c514f3331f942afc61ff483126418
 DIST macopix-mascot-mizuiro-ja-1.00.tar.gz 183981 RMD160 ea3ad37c005dc43f086dcb825ae06f05b23799c6 SHA1 bc0fc41204414c35e16e3f7d0d71657ec7efc533 SHA256 682c873cdd8d864e424c3630f776983f8c6c10b601bc7b608c064d278badab31
 DIST macopix-mascot-one-ja-1.00.tar.gz 207463 RMD160 bd772cff72265783c0cdca63667aa45090ee5071 SHA1 c66a30711cc44e1253bd17845ca9db9f758c8d1e SHA256 8367164e1c2581136b717507739323db2ca54f76e2afe188dde82ddf1b076e2a
 DIST macopix-mascot-pia2-ja-1.00.tar.gz 187213 RMD160 2fc201a1792e080948390ad1745467923ef2d020 SHA1 d10539f43bbb13fd904ad20b492368ce2911d096 SHA256 1612033fe3f1bb2ac6c3e9f1b1c97d9a0897ada366c6366354e2ad13d52b1f7c
 DIST macopix-mascot-triangle_heart-ja-1.00.tar.gz 304526 RMD160 1e0b8b77d19c4f8a6e8f6058b981e35ee0d1df14 SHA1 7f56da4c97a1c37053833d1a892b42ed14ba6d95 SHA256 11f081c487ea8d319f086894b7273135e4342502fb1dd1cc3749dccf2f7fd5d7
 DIST macopix-mascot-tsukihime-ja-1.00.tar.gz 604261 RMD160 70b486c505f42fe9829c1e776f804e1dc1e94201 SHA1 1b59ad8cf380c270033ee302fea77c19611aa6ad SHA256 ebdcf55b5b25af4a278f09ea0f08222e21e8fce7650311bc9e0c852b1881e480
-EBUILD macopix-1.0.4.ebuild 1553 RMD160 4001046678ce1af6c170c35f8948dc6246b4418e SHA1 1e0015237919904dc4a426b3ad5b5e7a58dd93cc SHA256 9a648e8f60e262f170af836232a536e47645340beb7739a75a20a279d8f49224
-MD5 3747c6ea5129b667d3e48118ff8bec05 macopix-1.0.4.ebuild 1553
-RMD160 4001046678ce1af6c170c35f8948dc6246b4418e macopix-1.0.4.ebuild 1553
-SHA256 9a648e8f60e262f170af836232a536e47645340beb7739a75a20a279d8f49224 macopix-1.0.4.ebuild 1553
-EBUILD macopix-1.2.1.ebuild 1688 RMD160 d5feaee0a9910392d8984c7c29ddf28917cf52f6 SHA1 1341ad2cc72d4175da9a60c1f090db3be90b43d3 SHA256 47ff726b7484fb6eff1a7baecdea7abf4888036a899ade932e86fc191c43a9ff
-MD5 22a8dcee295150241925c58611faa02c macopix-1.2.1.ebuild 1688
-RMD160 d5feaee0a9910392d8984c7c29ddf28917cf52f6 macopix-1.2.1.ebuild 1688
-SHA256 47ff726b7484fb6eff1a7baecdea7abf4888036a899ade932e86fc191c43a9ff macopix-1.2.1.ebuild 1688
-MISC ChangeLog 1676 RMD160 82b08ad3f5a171f11bc5f2ff3095442baae42948 SHA1 9684a4dacd90ba5b48c15ac9bf986ed78477e5c1 SHA256 14e4fb3f13d101ed6b22fea039468edf27d6265899120d77d9387560448e248f
-MD5 d09b98d11249fdd1b694012974ff876c ChangeLog 1676
-RMD160 82b08ad3f5a171f11bc5f2ff3095442baae42948 ChangeLog 1676
-SHA256 14e4fb3f13d101ed6b22fea039468edf27d6265899120d77d9387560448e248f ChangeLog 1676
+EBUILD macopix-1.2.1.ebuild 1740 RMD160 2b1127ae235ab10732fc48ce99bac71697592641 SHA1 735df86fbd2f379f59f4b8fb65e3a7967e558cd5 SHA256 aa40926acc93f64fab3c6f37c5e66cb686559f176417c4a9f4f6544d91d55abe
+MD5 87317c3c9c375e69e04bb661f6b7f7dd macopix-1.2.1.ebuild 1740
+RMD160 2b1127ae235ab10732fc48ce99bac71697592641 macopix-1.2.1.ebuild 1740
+SHA256 aa40926acc93f64fab3c6f37c5e66cb686559f176417c4a9f4f6544d91d55abe macopix-1.2.1.ebuild 1740
+EBUILD macopix-1.4.1.ebuild 1802 RMD160 5ddd791effe30cd9713746347e95d78e4bc304e3 SHA1 fce6296d368145131c0189042036e01ed8c1ac8c SHA256 173914c13d50c144b9cb69ddd6c49ba0968b2632069ee3abb77db40edc906a62
+MD5 d8e1cbba60b7704922926d0d877c3db0 macopix-1.4.1.ebuild 1802
+RMD160 5ddd791effe30cd9713746347e95d78e4bc304e3 macopix-1.4.1.ebuild 1802
+SHA256 173914c13d50c144b9cb69ddd6c49ba0968b2632069ee3abb77db40edc906a62 macopix-1.4.1.ebuild 1802
+MISC ChangeLog 2068 RMD160 71c3f48012b1dbbab6fe2c1fa824ae9bd19b9cd5 SHA1 103e6c821a6640029730032d81adc23f1fd82f62 SHA256 d5f108a04718e296ba8beb25a5b95856d6d4119dfecee88a5ccbb23d945d627c
+MD5 487806b64dd8afef673d74b74883ebb6 ChangeLog 2068
+RMD160 71c3f48012b1dbbab6fe2c1fa824ae9bd19b9cd5 ChangeLog 2068
+SHA256 d5f108a04718e296ba8beb25a5b95856d6d4119dfecee88a5ccbb23d945d627c ChangeLog 2068
 MISC metadata.xml 221 RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f SHA1 58771ce3377eeee2ebf1bb8acdeaa0ba169e9342 SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f metadata.xml 221
 SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf metadata.xml 221
-MD5 78dee4c4749ed4301eb2324ef942727e files/digest-macopix-1.0.4 2491
-RMD160 1d1833e8480321e315d12944ddd5f420a699ffdf files/digest-macopix-1.0.4 2491
-SHA256 cdad0b2fecd756411b468168049d2cbd8eea22eb658a3593a309e33319ba6ab7 files/digest-macopix-1.0.4 2491
 MD5 a4f0eabe4e67f88cbc01fea4c2ca16ed files/digest-macopix-1.2.1 2893
 RMD160 52a667ceed4face89df3ef9b5db94d329f190841 files/digest-macopix-1.2.1 2893
 SHA256 f52f72a97d0b48d8a897e55c946fcf90c329f5ab254baa7c55460d0c64e3c859 files/digest-macopix-1.2.1 2893
+MD5 519a490833ec36fae7fcd44c80955cd2 files/digest-macopix-1.4.1 3185
+RMD160 fdf0df53f7eb2a58096afd894c505bf4f34ef9ef files/digest-macopix-1.4.1 3185
+SHA256 9abc8fec7792c760a7f5099fd97442ea7f6e607e6d882d30bcb3c5013826f3aa files/digest-macopix-1.4.1 3185
diff --git a/x11-misc/macopix/files/digest-macopix-1.0.4 b/x11-misc/macopix/files/digest-macopix-1.0.4
deleted file mode 100644
index f27c3d53d7c4..000000000000
--- a/x11-misc/macopix/files/digest-macopix-1.0.4
+++ /dev/null
@@ -1,26 +0,0 @@
-MD5 d390ac104c97c3ae22e0eaa57fccbdf4 macopix-1.0.4.tar.bz2 440812
-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 4d62ed211e1cbd1b7e99b8d167609f9c macopix-mascot-marimite-ja-1.20.tar.gz 788828
-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/macopix-1.0.4.ebuild b/x11-misc/macopix/macopix-1.0.4.ebuild
deleted file mode 100644
index 8f2b39649ec5..000000000000
--- a/x11-misc/macopix/macopix-1.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.0.4.ebuild,v 1.6 2006/09/01 17:29:07 genstef Exp $
-
-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="cosmos mizuiro pia2 tsukihime triangle_heart comic_party kanon one"
-for i in ${MY_MASCOTS} ; do
-	SRC_URI="${SRC_URI} ${BASE_URI}/${PN}-mascot-${i}-ja-1.00.tar.gz"
-done
-MY_MASCOTS="${MY_MASCOTS} marimite"
-SRC_URI="${SRC_URI} ${BASE_URI}/${PN}-mascot-marimite-ja-1.20.tar.gz"
-
-# programme itself is GPL-2, and mascots are free-noncomm
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-IUSE="nls"
-
-DEPEND=">=x11-libs/gtk+-2.0.0
-	>=dev-libs/glib-2.0.0
-	nls? ( >=sys-devel/gettext-0.10 )
-	media-libs/libpng"
-
-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}/${PN}-mascot-${d}-ja
-		insinto /usr/share/${PN}
-		# please ignore doins errors ...
-		doins *.mcpx *.menu
-		insinto /usr/share/${PN}/pixmap
-		doins *.png
-		docinto $d
-		dodoc README.jp
-	done
-}