diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2013-02-16 13:59:16 +0000 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2013-02-16 13:59:16 +0000 |
| commit | 4f22e3fbd54ba9ca05373ac430aae673f18823bd (patch) | |
| tree | c6ddb4499898eb1109002a6ef8a4916c9ea72285 | |
| parent | Took maintainership. Version bump to 0.9.8. Removed epatch call since it was ... (diff) | |
| download | historical-4f22e3fbd54ba9ca05373ac430aae673f18823bd.tar.gz historical-4f22e3fbd54ba9ca05373ac430aae673f18823bd.tar.bz2 historical-4f22e3fbd54ba9ca05373ac430aae673f18823bd.zip | |
Override USE='png -zlib' (bug 454890)
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC
| -rw-r--r-- | media-libs/leptonica/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/leptonica/Manifest | 12 | ||||
| -rw-r--r-- | media-libs/leptonica/leptonica-1.69.ebuild | 11 |
3 files changed, 18 insertions, 10 deletions
diff --git a/media-libs/leptonica/ChangeLog b/media-libs/leptonica/ChangeLog index 01ff8f39af04..f89b0d89141f 100644 --- a/media-libs/leptonica/ChangeLog +++ b/media-libs/leptonica/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/leptonica # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.5 2013/01/24 21:38:48 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.6 2013/02/16 13:59:12 tomka Exp $ + + 16 Feb 2013; Thomas Kahle <tomka@gentoo.org> leptonica-1.69.ebuild: + Override USE='png -zlib' (bug 454890) *leptonica-1.69 (24 Jan 2013) diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest index 5f7a0850e8c5..a134046144b2 100644 --- a/media-libs/leptonica/Manifest +++ b/media-libs/leptonica/Manifest @@ -5,15 +5,13 @@ AUX leptonica-1.68-zlib-include.patch 426 SHA256 49e5795d29a9e9c356fa1b2cfbf4773 DIST leptonica-1.68.tar.gz 6695020 SHA256 acefb6c50db2913f117afdbb19a549f7409cf8fa5d9a435692cb10ff89a81f8f SHA512 3dad38279c328e671f65018d86c04da59a6dff481ff48530a6341505abbd3e2a526a5825a0995d77c690f54acbaa0818832bd44dd4246a87d726862e0c31d82b WHIRLPOOL e680f898ddabff46bedc0a8aed6bee95a3a748beaa5e68be3d8ea170fbfad501a68277f243a9d5aeab698aca068b8ef8be427fe69ba99f8d630fd207f913ff1f DIST leptonica-1.69.tar.gz 7618131 SHA256 3eb7669dcda7e417f399bb3698414ea523270797dfd36c59b08ef37a3fe0a72d SHA512 b30eb3fec393e48579fd29417f6e79977b727c80fec894fc04122118ee536a7749218af45a05de327bfe05c01b3bd677552a8fff4410c318713e3914f58a5e71 WHIRLPOOL e9beb2b73110601abef76ff56969a8e0979fabd175e2b84b63dec2c2cb6d2ca7eee4aa8062e1d51946759846c3c111ff46d440d33d7131c540db6b9eb41d11d7 EBUILD leptonica-1.68.ebuild 1444 SHA256 e22513c1ca1b0b3a766a8369b15b2360e653a9d8641e7fd544dd7f8cc0829784 SHA512 f96237d191d2dd69a94fb8448397ed8d8ef0e1b8b3646906348ff57f787b90231496d7b53fc95a0ba9b0468fd3454c91261ea622c087bf1677cf571e0902f83d WHIRLPOOL 24e88c00c8c5e39aff314f5f171e80a808fcb7fc9e86077084532f9d1446346da37ce277978347783cd6d1bcb93863c0f17ce15af9941e9fdecf52a8969449a3 -EBUILD leptonica-1.69.ebuild 1342 SHA256 a6c02964894d6f0a7417a3a4ce4c6fad25a1bbea87cc63c10cecff4c886b69e0 SHA512 6f304482a9b7c36d1a8eccb0bd21913f9e50d930371abeafa8b25c8ea68e9fe1145b928fc08029ca147a1917f87064aafacbb331bff8f85e222b99230049f81a WHIRLPOOL 2e7f02496cc4654ffbbf71a872248250345e8c153a0fe3703f9573727ac9e903d5c8e0b3bb6603ea2778ee7ddbd5799c34a58b86d3d242ebc54ca9862ccd46b4 -MISC ChangeLog 905 SHA256 169e018d6807cf2d00dbfdb9f03461322ddc78879b5893b59b9c56a315c501e8 SHA512 2279bab2ff87355183b72049bbc973ea44e8ccaa017c5ae3ddb521c662cce25147b9b035bdcfb1b0c3efe0920aaf6274e8e1e49ba528d051d386866a9f6f5e04 WHIRLPOOL 3a264661e6fe709512a785b3791442e9a006dadc77971211f975c0200210334469cd4fcd97c46f96f00bc5089ad831320f5a6820fc68ae852c0e550376258a0d +EBUILD leptonica-1.69.ebuild 1533 SHA256 0d6ea4ea967a01a32d31aff769356ce15b07bf5255611800f970760270fdc2f2 SHA512 01540376e528fccb2aee3704d258edaafc363d0776c87f96e3bc336e04f4ed33767bcb4167a31fa5e06ffa5031276a5848ec0bdcd36b9b876b029481c5284a5e WHIRLPOOL 36a647d6a2bb057f961ad437187676511021c50a2219517115b0927393816326fe8d74af67a953f3750839bb92ebb6e7b8e33f2a447a313f84cc19a36005c9b2 +MISC ChangeLog 1013 SHA256 d94ad1b9fdffd81009c26eb25a6f91fbf9008125143e90ea7d4bfa659af93519 SHA512 0a7696bc8d1858e2f6a7844434d519e924c16508dc0263b1c5660900abbb0f7ede40668e4be8b14cf9d5c1c59c527a8e8413bd6ee80d05150306d0d6f7b18258 WHIRLPOOL 0ce5d330d0edc3d9b03cbe89b72cfa7b2a894b9739b427fd21c54dcf602efe0dac50f4ee93f5cdd3a7bbe43299333cb8a191194edf48bf903a8c713f4a0e55fe MISC metadata.xml 378 SHA256 da48cfcf402e4db42e77afb2e0ab97855f3ae1731e230008e8cceb4e0cf507d3 SHA512 26a605380ed3c90a17bd6d2ba2d7f472f38422ead42c735502e2dd648c02a3bdaeac27013960a67711182442c1bacdc1879345806073181e4660e95db912a0da WHIRLPOOL 77ffce44de450a478af3efd2fd8784206ac135376e54f7d9d0f5a0427c2483d1a9f59f3e3b4d3d415a2c7560c58dfc1abb2a1fadc436a911d262ff3229525ce4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iJwEAQEIAAYFAlEBqe4ACgkQIaLonLtsQsfc6gQAgVStn2W5r8UPjDzS/cmm19d+ -YkIBB832RaNpFS575qlevhUvotvN9J0ZkbsHCffTcH02EuqfzIK9M7/oZlfOC4ox -6rx8Fb6mhSehy124mExEzFqUEN5GmNFWT86FIGXfoyAD/1c7+QRwme1v2BQWoSVK -bPRj3AEtaG5D8QVheUI= -=pJA7 +iF4EAREIAAYFAlEfkLEACgkQid6yGVZcMry8RwEAsI3XtwZXWtJR2ZTgBruq8B8M +vIsBRKSQAWizk7HL3b0A+wac3rhu52G8CF2aSz2cmNbZq4NOSuttSAuQ3nRnIyrF +=I/m1 -----END PGP SIGNATURE----- diff --git a/media-libs/leptonica/leptonica-1.69.ebuild b/media-libs/leptonica/leptonica-1.69.ebuild index 8db3fa7ba7d0..691e961616f8 100644 --- a/media-libs/leptonica/leptonica-1.69.ebuild +++ b/media-libs/leptonica/leptonica-1.69.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.69.ebuild,v 1.1 2013/01/24 21:38:48 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.69.ebuild,v 1.2 2013/02/16 13:59:12 tomka Exp $ EAPI=4 @@ -39,14 +39,21 @@ src_prepare() { src_configure() { # $(use_with webp libwebp) -> unknown # so use-flag just for pulling dependencies + # zlib handling see bug 454890 local myeconfargs=( $(use_with gif giflib) $(use_with jpeg) $(use_with png libpng) $(use_with tiff libtiff) - $(use_with zlib) $(use_enable utils programs) $(use_enable static-libs static) ) + # libpng requires zlib: + if use png && ! use zlib ; then + # Ignore users non-sensical choice of -zlib + myeconfargs+=("--with-zlib") + else + myeconfargs+=( $(use_with zlib) ) + fi autotools-utils_src_configure } |