Make CURL dependency optional, ebuild enhancement by Nadim Kobeissi <nadim@keihatsu.org>.

Package-Manager: portage-2.1.4_rc14

4 files changed, 37 insertions, 15 deletions

diff --git a/media-gfx/jp2a/ChangeLog b/media-gfx/jp2a/ChangeLog
index 1330a98c217c..97ab01fd2281 100644
--- a/media-gfx/jp2a/ChangeLog
+++ b/media-gfx/jp2a/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/jp2a
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jp2a/ChangeLog,v 1.2 2008/01/09 17:04:27 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jp2a/ChangeLog,v 1.3 2008/01/09 17:58:57 chainsaw Exp $
+
+*jp2a-1.0.6-r1 (09 Jan 2008)
+
+  09 Jan 2008; Tony Vroon <chainsaw@gentoo.org> -jp2a-1.0.6.ebuild,
+  +jp2a-1.0.6-r1.ebuild:
+  Make CURL dependency optional, ebuild enhancement by Nadim Kobeissi
+  <nadim@keihatsu.org>.
 
   09 Jan 2008; Samuli Suominen <drac@gentoo.org> jp2a-1.0.6.ebuild:
   Keyword ~amd64.
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index 6dfbb973aeaa..901b46f8087e 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,16 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jp2a-1.0.6.tar.bz2 306975 RMD160 65cf03006f1bcd205ceb3ae294def87f878ce741 SHA1 1ba825d7e7c90fce450bd4f471797a5bef977138 SHA256 7869c13744b0e15c250cae88b55f0dfade17e6c2b0a03b309dbe89bd34b342d4
-EBUILD jp2a-1.0.6.ebuild 570 RMD160 77817dc8db42cbcb8b8e02d52c70faeb7b1a48fa SHA1 46eed594cb2fccfca3f9d3a9cfe9976a3bd7f370 SHA256 b929f5fd4fbf81dd03854c898def8fb8aa262056329c6bf30b1e5551dfddeece
-MD5 963cbb86ccfd5a09753ef1243466d427 jp2a-1.0.6.ebuild 570
-RMD160 77817dc8db42cbcb8b8e02d52c70faeb7b1a48fa jp2a-1.0.6.ebuild 570
-SHA256 b929f5fd4fbf81dd03854c898def8fb8aa262056329c6bf30b1e5551dfddeece jp2a-1.0.6.ebuild 570
-MISC ChangeLog 517 RMD160 2cbc2e5556aca62329a398a66d7d7004cce571cb SHA1 566ab0cd291dc44d27999a375d5798e3cca31f04 SHA256 df6fd5280453408853975eba8c2a2d62ba5cb702277693a05dba9e9e45efdfbc
-MD5 6a1af2f5ce1c40a8010fa4641b6639f1 ChangeLog 517
-RMD160 2cbc2e5556aca62329a398a66d7d7004cce571cb ChangeLog 517
-SHA256 df6fd5280453408853975eba8c2a2d62ba5cb702277693a05dba9e9e45efdfbc ChangeLog 517
+EBUILD jp2a-1.0.6-r1.ebuild 671 RMD160 f226b1c2de96771860c6a7a6d5bca1971a9d5b66 SHA1 b522bc9971c81e592af477470ad3e57faac56c78 SHA256 6717abaed5cc3f07b5c5bd23fe3ae3664e6e5551976fb34908ba1cb1fe7c67ea
+MD5 8b7b5761428f7640c4e6106c6b0bf741 jp2a-1.0.6-r1.ebuild 671
+RMD160 f226b1c2de96771860c6a7a6d5bca1971a9d5b66 jp2a-1.0.6-r1.ebuild 671
+SHA256 6717abaed5cc3f07b5c5bd23fe3ae3664e6e5551976fb34908ba1cb1fe7c67ea jp2a-1.0.6-r1.ebuild 671
+MISC ChangeLog 739 RMD160 ca67f278d95869c28f9f289bb30db247b24aa383 SHA1 20c96c4bb535de0a548e2452b8cf71c605b14370 SHA256 4c3b9ffc996703f965f9e35e54af0adf18ddb9f92bcc9482d77acf4dad519cf5
+MD5 8c5b3379dc390c324a343fc34de28585 ChangeLog 739
+RMD160 ca67f278d95869c28f9f289bb30db247b24aa383 ChangeLog 739
+SHA256 4c3b9ffc996703f965f9e35e54af0adf18ddb9f92bcc9482d77acf4dad519cf5 ChangeLog 739
 MISC metadata.xml 250 RMD160 6bbdc9d6d979eae6d4ec2a7f5294ef09611d9dbc SHA1 765762962967f3eb41eb2f6a74dec6b80e3d0cbe SHA256 8f7792a007816fa31c4b25268b5cf224c15ceef5dfef8bd45c56c70295cdc4e9
 MD5 eb8f9a4ad0863abbec8de782e35f9496 metadata.xml 250
 RMD160 6bbdc9d6d979eae6d4ec2a7f5294ef09611d9dbc metadata.xml 250
 SHA256 8f7792a007816fa31c4b25268b5cf224c15ceef5dfef8bd45c56c70295cdc4e9 metadata.xml 250
-MD5 adf94b76a815066b7b1a9567c53e34ac files/digest-jp2a-1.0.6 235
-RMD160 3497691cc037306be158a503a341db6503e8e817 files/digest-jp2a-1.0.6 235
-SHA256 cfb481f996aed6b66ba8e0e6d4f1aa7751da21e67e5c6648290b7d57ca8ef7c0 files/digest-jp2a-1.0.6 235
+MD5 adf94b76a815066b7b1a9567c53e34ac files/digest-jp2a-1.0.6-r1 235
+RMD160 3497691cc037306be158a503a341db6503e8e817 files/digest-jp2a-1.0.6-r1 235
+SHA256 cfb481f996aed6b66ba8e0e6d4f1aa7751da21e67e5c6648290b7d57ca8ef7c0 files/digest-jp2a-1.0.6-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeFC1IACgkQp5vW4rUFj5oi2QCeKCRNbUJW5QviZLiAUxNxNqyU
+eIsAoK/Dtjff0uR7RUh2nEYYTNHokqQi
+=MJb2
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/jp2a/files/digest-jp2a-1.0.6 b/media-gfx/jp2a/files/digest-jp2a-1.0.6-r1
index c88a0d075fa9..c88a0d075fa9 100644
--- a/media-gfx/jp2a/files/digest-jp2a-1.0.6
+++ b/media-gfx/jp2a/files/digest-jp2a-1.0.6-r1
diff --git a/media-gfx/jp2a/jp2a-1.0.6.ebuild b/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
index 5bea51ad16a6..203b991a5a09 100644
--- a/media-gfx/jp2a/jp2a-1.0.6.ebuild
+++ b/media-gfx/jp2a/jp2a-1.0.6-r1.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/media-gfx/jp2a/jp2a-1.0.6.ebuild,v 1.2 2008/01/09 17:04:27 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild,v 1.1 2008/01/09 17:58:57 chainsaw Exp $
 
 DESCRIPTION="JPEG image to ASCII art converter"
 HOMEPAGE="http://csl.sublevel3.org/jp2a/"
@@ -8,11 +8,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="curl"
 DEPEND="media-libs/jpeg
-	net-misc/curl"
+	curl? ( net-misc/curl )"
 RDEPEND="${DEPEND}"
 
+src_compile() {
+	econf $(use_enable curl) || die
+	emake || die "make failed"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dohtml man/jp2a.html