Add missing deps, should fix bug #206170, quote variables, do temporary stuff in T rather than in D to delete it after...

Package-Manager: portage-2.1.4

3 files changed, 35 insertions, 23 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index edf9d72bd7f8..7cec760a8dbd 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/camlimages
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.9 2008/01/03 20:36:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.10 2008/01/27 14:07:32 aballier Exp $
+
+  27 Jan 2008; Alexis Ballier <aballier@gentoo.org> camlimages-2.20.ebuild:
+  Add missing deps, should fix bug #206170, quote variables, do temporary
+  stuff in T rather than in D to delete it after...
 
   03 Jan 2008; Alexis Ballier <aballier@gentoo.org> camlimages-2.20.ebuild:
   ocamlopt is required here, there is no option to disable it sanely
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 794d3745ca83..c8b4e549c74e 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -10,14 +10,14 @@ MD5 f8272d66ad86ec1812b000fe5ff46f8e files/camlimages-2.20-ocaml-3.09.diff 385
 RMD160 b235b80d0e972a9c05c1f6acbdff335775c0a4e5 files/camlimages-2.20-ocaml-3.09.diff 385
 SHA256 5666ac67637d63fd40248ae2ead4ab6a9ab8b96139a670926ba28f186ed5027f files/camlimages-2.20-ocaml-3.09.diff 385
 DIST camlimages-2.2.tgz 1385525 RMD160 0f108ef3da565aeb0ab10d00e45819399af36d8c SHA1 bc0062739be5ca9236f28145f17f840bf3f295ee SHA256 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
-EBUILD camlimages-2.20.ebuild 1706 RMD160 92cea61ef912c660fd9e28c39e586dfde2ea0643 SHA1 8f4af053531e6e60007eb60cc8bbfa1d91317e23 SHA256 db67a71b81d3d307c3427a4024bd668ec08cc9367f21e5892e7914befcb58c65
-MD5 c2906b6567a866a5976bcfb32477c80a camlimages-2.20.ebuild 1706
-RMD160 92cea61ef912c660fd9e28c39e586dfde2ea0643 camlimages-2.20.ebuild 1706
-SHA256 db67a71b81d3d307c3427a4024bd668ec08cc9367f21e5892e7914befcb58c65 camlimages-2.20.ebuild 1706
-MISC ChangeLog 1799 RMD160 8d5c730aca85d0d5f1fd6e03c5ebf4b6206791f7 SHA1 52ebcff4481e8451e6b24f2b4f4a2433b8460bb1 SHA256 1d0d492ca380c4e0e3b8b40d86ebb867b78abb59d8063a60719a9382c79488e5
-MD5 4f66fcad8a412be0befbc718a3e22fa4 ChangeLog 1799
-RMD160 8d5c730aca85d0d5f1fd6e03c5ebf4b6206791f7 ChangeLog 1799
-SHA256 1d0d492ca380c4e0e3b8b40d86ebb867b78abb59d8063a60719a9382c79488e5 ChangeLog 1799
+EBUILD camlimages-2.20.ebuild 1892 RMD160 0fe17cf32af9dc68d2249780154d42f53736ebc4 SHA1 099f8a17f2a3be1ccea45c75d8422e0198907bb8 SHA256 f6b0e3f341f738d5fa144ce4f61a0e15b9e65d1d7454f54a54ef72ded1f54aa0
+MD5 1b09dd3696c23d5331182a89aeaa0141 camlimages-2.20.ebuild 1892
+RMD160 0fe17cf32af9dc68d2249780154d42f53736ebc4 camlimages-2.20.ebuild 1892
+SHA256 f6b0e3f341f738d5fa144ce4f61a0e15b9e65d1d7454f54a54ef72ded1f54aa0 camlimages-2.20.ebuild 1892
+MISC ChangeLog 2003 RMD160 50d0de5defe626557a429355e21f73eed813acd5 SHA1 2e568830faa00166bfb1d7d9801ccf838827123c SHA256 607dfec7ebb3548db9f5f69f257878e5b1c2bf1da5223c80f53ff6d7fb01b84f
+MD5 628b09a518f4ee73bad2ad1fd67a812c ChangeLog 2003
+RMD160 50d0de5defe626557a429355e21f73eed813acd5 ChangeLog 2003
+SHA256 607dfec7ebb3548db9f5f69f257878e5b1c2bf1da5223c80f53ff6d7fb01b84f ChangeLog 2003
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -26,9 +26,9 @@ MD5 a2b0ca6c7075a874c496eb03b3142132 files/digest-camlimages-2.20 238
 RMD160 6e2ba431718f102e8e571bd43612cb172ce3fc52 files/digest-camlimages-2.20 238
 SHA256 b1e886955276729e8d9426d560c906c6ca179ce1573f84d5d44b32b072bbb137 files/digest-camlimages-2.20 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkd9R2wACgkQvFcC4BYPU0oRWgCeMP1gVSneVK920XxQImYjQGWQ
-VRAAn0vzNHzn9mZr2d6zcSxpV3KtRJAR
-=V1Nv
+iD8DBQFHnJAsvFcC4BYPU0oRAqEnAJoCWW/Hj+vvmDod93hE0xvdSiTeQACguVqo
+jc4EO46DOx7REPhMEJcRtqY=
+=h8Mb
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-2.20.ebuild b/dev-ml/camlimages/camlimages-2.20.ebuild
index 28518f2c2dfe..e76b3927fced 100644
--- a/dev-ml/camlimages/camlimages-2.20.ebuild
+++ b/dev-ml/camlimages/camlimages-2.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.5 2008/01/03 20:36:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.6 2008/01/27 14:07:32 aballier Exp $
 
 inherit findlib eutils
 
@@ -14,7 +14,16 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 x86 ppc"
 
-DEPEND=">=dev-lang/ocaml-3.08"
+DEPEND=">=dev-lang/ocaml-3.08
+	gtk? ( dev-ml/lablgtk )
+	opengl? ( dev-ml/lablgl )
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	x11-libs/libXpm
+	>=media-libs/freetype-2
+	virtual/ghostscript"
 
 MY_S="${WORKDIR}/${P/20/2}"
 
@@ -32,7 +41,7 @@ src_unpack() {
 	cd ${MY_S}
 	if has_version ">=dev-lang/ocaml-3.09";
 	then
-		epatch ${FILESDIR}/${P}-ocaml-3.09.diff
+		epatch "${FILESDIR}/${P}-ocaml-3.09.diff"
 	fi
 }
 
@@ -67,14 +76,13 @@ src_install() {
 	# Use findlib to install properly, especially to avoid
 	# the shared library mess
 	findlib_src_preinst
-	mkdir ${D}/tmp
+	mkdir "${T}/tmp"
 	cd ${MY_S}
-	make CAMLDIR=${D}/tmp \
-		LIBDIR=${D}/tmp \
-		DESTDIR=${D}/tmp \
+	make CAMLDIR="${T}/tmp" \
+		LIBDIR="${T}/tmp" \
+		DESTDIR="${T}/tmp" \
 		install || die
-	sed -e "s/VERSION/${PV}/" ${FILESDIR}/META > ${D}/tmp/META
+	sed -e "s/VERSION/${PV}/" "${FILESDIR}/META" > "${T}/tmp/META"
 
-	ocamlfind install camlimages ${D}/tmp/*
-	rm -rf ${D}/tmp
+	ocamlfind install camlimages "${T}"/tmp/*
 }