summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2010-12-12 07:30:02 +0000
committerRyan Hill <rhill@gentoo.org>2010-12-12 07:30:02 +0000
commitc0a7ce33b8c0429590528b6c0263a83ac9d65e00 (patch)
tree74c610a8022b5f2a8485f5c1fef7075a2f3f461d /dev-python/wxpython
parentamd64 stable; bug #346599 (diff)
downloadhistorical-c0a7ce33b8c0429590528b6c0263a83ac9d65e00.tar.gz
historical-c0a7ce33b8c0429590528b6c0263a83ac9d65e00.tar.bz2
historical-c0a7ce33b8c0429590528b6c0263a83ac9d65e00.zip
media-libs/jpeg -> virtual/jpeg (bug #347958)
Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64
Diffstat (limited to 'dev-python/wxpython')
-rw-r--r--dev-python/wxpython/ChangeLog6
-rw-r--r--dev-python/wxpython/Manifest18
-rw-r--r--dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild4
-rw-r--r--dev-python/wxpython/wxpython-2.8.10.1.ebuild4
-rw-r--r--dev-python/wxpython/wxpython-2.8.11.0.ebuild4
5 files changed, 25 insertions, 11 deletions
diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 06dea5a1f1b4..860d0c84468d 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/wxpython
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.137 2010/07/27 03:13:09 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.138 2010/12/12 07:30:02 dirtyepic Exp $
+
+ 12 Dec 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild,
+ wxpython-2.8.10.1.ebuild, wxpython-2.8.11.0.ebuild:
+ media-libs/jpeg -> virtual/jpeg (bug #347958)
27 Jul 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild,
wxpython-2.8.10.1.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 91c5d03f27f7..05e3174327fc 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
AUX wxpython-2.8-cache-writable.patch 538 RMD160 1d627cfae8a819850d6f6807b6547b138e63e5a0 SHA1 e6c4e5732f2a3792bea50a9ff51d233569ca490e SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429
AUX wxpython-2.8-drop-editra.patch 2276 RMD160 dc3b1e9fbf57d5c5c4c97c6f6ccaf1bc00d5ebf9 SHA1 755549eea057f3f84ffdd19c3d7ea8f1ed7a3ca8 SHA256 b54b8ddf0f50e0d6c214d7e7d7105389a160a633ee2307b2f4a4c09b40a65f28
@@ -12,8 +15,15 @@ DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 RMD160 86084386383904972df15aa65ca
DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
-EBUILD wxpython-2.6.4.0-r2.ebuild 3577 RMD160 72bc036d3a60006ce8416b9581da097fb7ff9efa SHA1 0f7a0d0087504441b202de2a7e0cc82e8a92203f SHA256 e07ee0ad8ee9d5ba67660ad8bbfc4d95d7c520359cf85af776b23484f23d06c3
-EBUILD wxpython-2.8.10.1.ebuild 5396 RMD160 7a399788a66c6bf57298e403b200f1d8161a3878 SHA1 d872cd4b02b62c46e20d3d381d587f2e876aab26 SHA256 9e18ed41e3bd1ea6792a76e6150c0adaa36c367d8a83562acfa051173b4f45ca
-EBUILD wxpython-2.8.11.0.ebuild 5404 RMD160 cdbdfff7e836ebc147eebea032d28c559e6f608f SHA1 eb2161d8980b8eb9dd40735838dee6f22e23996e SHA256 536703d7b990e63c8d843f8e51862261f460b2f31c399af09ed6c22e2a6d09cb
-MISC ChangeLog 25632 RMD160 38d5c87c7b5434206d11fca344de369b07a3171c SHA1 b14920094d1946e6c1bf07660cc890595f7c1186 SHA256 d6a26ce526dc0b39b1e458b339f43ca1960e1c060dcd5fe3149b2916629ca1d6
+EBUILD wxpython-2.6.4.0-r2.ebuild 3575 RMD160 f72d7a65804adb476bbd6e993a5540338e7ea897 SHA1 3fe6fa815e14e5b982daef92a34b13ba795a252a SHA256 e610866d17d507d7fc6635418043a5e7e6ea259df4b0b976ffa3a9df719f4503
+EBUILD wxpython-2.8.10.1.ebuild 5392 RMD160 b100a625596281e64247aa47fd435d69361b5f63 SHA1 be116a1f94bcb2ed3d8e1bdeebfcdbbcea5a5d0b SHA256 1e35b2d6e10ab8ddad6d81c6247a05a5ceda7852f281f9216f71abf0a211520c
+EBUILD wxpython-2.8.11.0.ebuild 5400 RMD160 a0bcd5f1c54510519bddb85402ffb50d1b60f916 SHA1 6c91694933f210e701ee659fdc510660d57a0b01 SHA256 98d5c314bfc250b8d05913285d40db92f303c2a0f98ad3ae4fe80afaa6cc15b0
+MISC ChangeLog 25811 RMD160 dc7b5fc30e7281c1447dee07a8d5ffa847f00bb4 SHA1 0fe9be766ba4c56336666da1974ed4de290e7c11 SHA256 6a06f76c9b9109b1ff9487d7c6f29b0d17048e37cd1b99f15df48185d0bebf2a
MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0EezUACgkQiqiDRvmkBmKPXwCfYMnayflW73zDd53tmUTBl0/+
+DLQAoMFBxQzsye33+dyA1hkKtjhmm7fZ
+=Lbod
+-----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild b/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
index 8156d0e38510..430dfad3da53 100644
--- a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild,v 1.14 2010/07/28 13:56:51 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild,v 1.15 2010/12/12 07:30:02 dirtyepic Exp $
EAPI="2"
PYTHON_DEPEND="2"
@@ -26,7 +26,7 @@ RDEPEND="
>=x11-libs/pango-1.2
>=dev-libs/glib-2.0
media-libs/libpng
- media-libs/jpeg
+ virtual/jpeg
media-libs/tiff
>=sys-libs/zlib-1.1.4
opengl? ( >=dev-python/pyopengl-2.0.0.44 )"
diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
index 897321a9bae7..a93d8dbd6f87 100644
--- a/dev-python/wxpython/wxpython-2.8.10.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.16 2010/07/28 13:56:51 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.17 2010/12/12 07:30:02 dirtyepic Exp $
EAPI="2"
PYTHON_DEPEND="2"
@@ -30,7 +30,7 @@ RDEPEND="
>=x11-libs/pango-1.2
>=dev-libs/glib-2.0
media-libs/libpng
- media-libs/jpeg:0
+ virtual/jpeg
media-libs/tiff
cairo? ( >=dev-python/pycairo-1.8.4 )
opengl? ( >=dev-python/pyopengl-2.0.0.44 )"
diff --git a/dev-python/wxpython/wxpython-2.8.11.0.ebuild b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
index b048b2cbcb46..6ffd475f69a4 100644
--- a/dev-python/wxpython/wxpython-2.8.11.0.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.2 2010/07/28 13:56:51 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.3 2010/12/12 07:30:02 dirtyepic Exp $
EAPI="2"
PYTHON_DEPEND="2"
@@ -30,7 +30,7 @@ RDEPEND="
>=x11-libs/pango-1.2
>=dev-libs/glib-2.0
media-libs/libpng
- media-libs/jpeg:0
+ virtual/jpeg
media-libs/tiff
cairo? ( >=dev-python/pycairo-1.8.4 )
opengl? ( >=dev-python/pyopengl-2.0.0.44 )"