Move pkgconfig to DEPEND wrt #217278.

Package-Manager: portage-2.1.5_rc6

4 files changed, 18 insertions, 87 deletions

diff --git a/x11-misc/macopix/ChangeLog b/x11-misc/macopix/ChangeLog
index 980c779212e6..c5d6d10890eb 100644
--- a/x11-misc/macopix/ChangeLog
+++ b/x11-misc/macopix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/macopix
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/ChangeLog,v 1.14 2007/11/02 16:38:41 coldwind Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/ChangeLog,v 1.15 2008/05/05 19:45:29 drac Exp $
+
+  05 May 2008; Samuli Suominen <drac@gentoo.org> macopix-1.2.1.ebuild,
+  -macopix-1.4.1.ebuild:
+  Move pkgconfig to DEPEND wrt #217278.
 
 *macopix-1.6.4 (02 Nov 2007)
 
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 5accf9c5caab..00987a5a36e0 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,9 +1,7 @@
 AUX macopix-1.2.1-gentoo.diff 480 RMD160 501356d0b7c601ba2a7c8a05caf67fb34b1dec3d SHA1 d65124ea9fd8ae9c2f69baf63a332360d4f3c6a9 SHA256 f6aa2cdf5f1965f73484d2ce115c96eb4b3041a907d91df40c3c8190e5d47891
 AUX macopix-1.2.1-nls.diff 438 RMD160 ceb15318cd130e0857297f5bc0d92ea18b8907bb SHA1 469846be92018b3890cd386e006ca2000b2a26af SHA256 919e61d956c6ba2d3447c20aa3789eec465490671e45fcf7722f309718ada041
 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-1.6.4.tar.bz2 704158 RMD160 3dae038033e57d6f82c67bfdd2aa96ea55f68710 SHA1 e530cc366deb1d073d1c06226f7a0f3e9ee4e317 SHA256 ed317c88bea3d535b79ee566633b3c11152864b6a8d587d9238eefd783fb5321
-DIST macopix-mascot-HxB-euc-ja-0.10.tar.gz 508852 RMD160 8e82f60404b8d5f13c752bc204df3af634e27202 SHA1 daeb5a938aef75f8db0f4d8ee5b0b159000c8372 SHA256 3e494ade3ffc70b766ff6fcfec4eb81451893f8e253eda64aae10bd1c1b9c50f
 DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 RMD160 4c52a6b4ce2aa8aee2952b01b23df262babc9700 SHA1 9c75de62a3d842a69ce0f161f8a65b33dc0c0875 SHA256 3e8ca25e163a97fca12e1a134943a7815e245c779ff88e9444b7af5ee117f4fb
 DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 RMD160 9291675c876ba37eda1ff279ed7a568b53ee65c4 SHA1 3ed3b970156ada6a8c656da0a207f598dd66b1f9 SHA256 3dbdcd20f2f1f99062263b70bcef92e31f81b1e3e6c62ac0de8f71df83cb1983
 DIST macopix-mascot-comic_party-ja-1.00.tar.gz 19101 RMD160 7ab45c6e4e34315f7744e9601060bcac25c184d5 SHA1 e4e85a0716c93db4136ff99a88f004cdf73ab2f5 SHA256 62f17672ad7d79a1d2f5d38f41450fb1557655fc28f400c74d3075291df4c378
@@ -23,8 +21,7 @@ DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 RMD160 b693b7ce0514
 DIST macopix-mascot-triangle_heart-ja-1.00.tar.gz 304526 RMD160 1e0b8b77d19c4f8a6e8f6058b981e35ee0d1df14 SHA1 7f56da4c97a1c37053833d1a892b42ed14ba6d95 SHA256 11f081c487ea8d319f086894b7273135e4342502fb1dd1cc3749dccf2f7fd5d7
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 RMD160 b6227b9e8c558d499fa9668c1a38d65cd8c8a77e SHA1 82154a0f943ea72e5c93b4789da200f0b6787e84 SHA256 6dcf1add046046f45ad9b23ed174b22537e23cfa3686b6bc84f607bd34a7ea8e
 DIST macopix-mascot-tsukihime-ja-1.00.tar.gz 604261 RMD160 70b486c505f42fe9829c1e776f804e1dc1e94201 SHA1 1b59ad8cf380c270033ee302fea77c19611aa6ad SHA256 ebdcf55b5b25af4a278f09ea0f08222e21e8fce7650311bc9e0c852b1881e480
-EBUILD macopix-1.2.1.ebuild 1740 RMD160 2b1127ae235ab10732fc48ce99bac71697592641 SHA1 735df86fbd2f379f59f4b8fb65e3a7967e558cd5 SHA256 aa40926acc93f64fab3c6f37c5e66cb686559f176417c4a9f4f6544d91d55abe
-EBUILD macopix-1.4.1.ebuild 1802 RMD160 5ddd791effe30cd9713746347e95d78e4bc304e3 SHA1 fce6296d368145131c0189042036e01ed8c1ac8c SHA256 173914c13d50c144b9cb69ddd6c49ba0968b2632069ee3abb77db40edc906a62
+EBUILD macopix-1.2.1.ebuild 1737 RMD160 0f019d4308c61576237b69773455e04f7a46ef1f SHA1 e13f13120e42b0ac315ef1d166763f446612a576 SHA256 17afa06b380de112124208f13a8eb97d92fd159c8e7c0b7e32c082037a9a47d3
 EBUILD macopix-1.6.4.ebuild 1962 RMD160 4a7b24a63b3c916c470fe2568bcb3ae98968e499 SHA1 0b17b3fbf2ef68bfc2fafde5f748c80925dcaead SHA256 3bca985357c08bf515542cf037d044e864ed2896de71820eb3f765bf9f44a22b
-MISC ChangeLog 2316 RMD160 7c66d387fe84d472a0e7326b3e71e0147dd776f6 SHA1 14f7d1f811bb23209b93f8cf292834dbab77471c SHA256 38d0149cbb3bd18b316c3a310f2d2ae2baf1709f0d03bea27f610dda7e34c43b
+MISC ChangeLog 2449 RMD160 d09422b6d2c73c8b9f63147749a0b2be530245ff SHA1 db1d6c6c1b795e6cf5c1382367e821bc95a89b1b SHA256 1859aaa8b35e393a5da1aaf28e2666d43347698f0030f8be520868ebfca3fdc4
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
diff --git a/x11-misc/macopix/macopix-1.2.1.ebuild b/x11-misc/macopix/macopix-1.2.1.ebuild
index 664469e69d13..50f68d868659 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
+# Copyright 1999-2008 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.7 2006/11/04 17:13:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.2.1.ebuild,v 1.8 2008/05/05 19:45:29 drac Exp $
 
 inherit eutils
 
@@ -26,17 +26,17 @@ 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
+RDEPEND=">=x11-libs/gtk+-2
 	media-libs/libpng"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10 )
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-nls.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-nls.diff
 }
 
 src_compile() {
@@ -52,7 +52,7 @@ src_install() {
 
 	# install mascots
 	for d in ${MY_MASCOTS} ; do
-		cd ${WORKDIR}/${PN}-mascot-${d}
+		cd "${WORKDIR}"/${PN}-mascot-${d}
 		insinto /usr/share/${PN}
 		# please ignore doins errors ...
 		doins *.mcpx *.menu
diff --git a/x11-misc/macopix/macopix-1.4.1.ebuild b/x11-misc/macopix/macopix-1.4.1.ebuild
deleted file mode 100644
index e56a4c7d45df..000000000000
--- a/x11-misc/macopix/macopix-1.4.1.ebuild
+++ /dev/null
@@ -1,70 +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.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
-}