Move pkgconfig to DEPEND wrt #217278.

(Portage version: 2.1.5_rc6)

3 files changed, 16 insertions, 82 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/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
-}