projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 68daaf1)
Avoid piwik code when generating docs, thanks Chris Mayo for his patch, bug #323005
authorSebastien Fabbro <bicatali@gentoo.org>
Mon, 7 Jun 2010 16:44:27 +0000 (16:44 +0000)
committerSebastien Fabbro <bicatali@gentoo.org>
Mon, 7 Jun 2010 16:44:27 +0000 (16:44 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

dev-python/matplotlib/ChangeLog patch | blob | history
dev-python/matplotlib/Manifest patch | blob | history
dev-python/matplotlib/files/matplotlib-0.99.3-nopiwik.patch [new file with mode: 0644] patch | blob
dev-python/matplotlib/matplotlib-0.99.3.ebuild patch | blob | history
dev-python/mpmath/Manifest patch | blob | history

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 33c58c8701406d6f9034c9efa99087039975363f..f326c77c12b378ba5e227407b4c708dd0aa73ccf 100644 (file)
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.89 2010/06/03 19:12:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.90 2010/06/07 16:44:27 bicatali Exp $
+
+  07 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  matplotlib-0.99.3.ebuild, +files/matplotlib-0.99.3-nopiwik.patch:
+  Avoid piwik code when generating docs, thanks Chris Mayo for his patch,
+  bug #323005
 
 *matplotlib-0.99.3 (03 Jun 2010)
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 001688108db373bfcab76676805c463c371932c9..ca082b8715c8b00e122e0ca52e47385d5676b08f 100644 (file)
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -8,16 +8,17 @@ AUX matplotlib-0.99.1.1-eintr.patch 1576 RMD160 57f233cf11552581e6105245222689e1
 AUX matplotlib-0.99.1.1-gtk-tooltip.patch 3234 RMD160 94e84e0ddfa45bf137b29dc9c2262c9a77c61156 SHA1 b67a2b7371db4647edd6a88f1f5ee796e6031e2d SHA256 7faa48903942e56aa8c5827c76d3512f321a5f94823abb11b3b7ae4869187747
 AUX matplotlib-0.99.1.1-libpng14.patch 404 RMD160 c259f9acb51b9981da68f14268d0c446184f1501 SHA1 eab90ab67ab4a7757f85e35f14b85c6dc363cc20 SHA256 7d1676f1b508ef27dabccd4efe52d5a47ca23c55735fd9777ae303a612cd1749
 AUX matplotlib-0.99.1.1-prefix.patch 1374 RMD160 f30e66336d6e51414babc63f0cc1e79319f27a3a SHA1 8201f7f5f4ce788aac91acc8cdd1d0ff43ae6a93 SHA256 0cf04d6d5124793af0e89bbf7aa20d821dccb5b7b95eb04aeeaa2723a48345ff
+AUX matplotlib-0.99.3-nopiwik.patch 1140 RMD160 ef7f28557049af8fc14ae9aa2d4d6ff8e63fe60c SHA1 d9de609da3fedadbf06ba594127bb6688f3cb1e5 SHA256 48ddbf057d0ef940c584fa154faa4b28ba254ab28661e6f6526cd099d08a24de
 DIST matplotlib-0.99.1.1.tar.gz 11905737 RMD160 2bd025944eab18d41ddf9f521c00a1f065346738 SHA1 57b5f1e3f0c8866af99f72fca06b4e529acba31d SHA256 1b94b4632ee4dcd41862f2a2e90fdca8f2e6fb108700c06a16e764782da49041
 DIST matplotlib-0.99.3.tar.gz 11911989 RMD160 8309fc700717119c71603829890fd0eb73b376e2 SHA1 1819ac7f9b22c942ee23c635c43825cd1e8865cc SHA256 3af9160a6d1d1bb73049d71df0906299016c9bba04d39480719a9904ed8b3ab2
 EBUILD matplotlib-0.99.1.1-r1.ebuild 5377 RMD160 359b9d1689df34aeb81cbdb6e63fda3719a7ae35 SHA1 d0e1b00c1fdbc1e435427f71be048365e1ed962a SHA256 df649a3816a7539cf2de7f7410de4342f6274c2ddf1273f3f5358e6e28b0d486
-EBUILD matplotlib-0.99.3.ebuild 5628 RMD160 35a557864ae3d8599179e566756ebeb737075410 SHA1 265001b089067d7d3bf3d01a9251a1a63c4e2a41 SHA256 43c15d744e592e65b2280b19bea7ae0e9313b62de3f404b9117b649f0c5a6310
-MISC ChangeLog 17489 RMD160 f25117a640cf4a821c234d4ed20d768dad891912 SHA1 5048e6c2f34f4621a7f672b44cd6031b88f8d01a SHA256 2702a07255e10a91fbf6b10216075bfbff7478c0d79e56f9531975e3078bdc1c
+EBUILD matplotlib-0.99.3.ebuild 5711 RMD160 d8f21dda71a75b82bac161b5b53333b5115ed28a SHA1 de42543fae0447a3dd7d72a1cc6f4e8df0c16a48 SHA256 18e4f9cf643c4848980af001b13fa097b83e0acc33a93a5c37dad2d8b4b2c770
+MISC ChangeLog 17701 RMD160 69032ccc3bd208809b6fe5d3a4fe9e753650d9fd SHA1 5638622df9fa178e52af6be8416b493ad4c0b9c5 SHA256 e2e00c4995bf7371d804ed0dd4c6a09391aa094b17a7db433cdfcd11d680520a
 MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwIByEACgkQ1ycZbhPLE2Db4ACghXfHTSNc5+C5g+VB8Ze/ciXw
-t+YAn3eK3KeQCHY0zff4fG6NFNGOL1dd
-=cY5z
+iEYEARECAAYFAkwNKg4ACgkQ1ycZbhPLE2BlaQCcDSg99/qaiQ0t8ysTRpGCiuc9
+ATAAningy715lCsQ28nhrYO+gJNnCA6g
+=kLzt
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/matplotlib-0.99.3-nopiwik.patch b/dev-python/matplotlib/files/matplotlib-0.99.3-nopiwik.patch
new file mode 100644 (file)
index 0000000..49f9795
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.99.3-nopiwik.patch
@@ -0,0 +1,22 @@
+diff -ur matplotlib-0.99.3.orig/doc/_templates/layout.html matplotlib-0.99.3/doc/_templates/layout.html
+--- matplotlib-0.99.3.orig/doc/_templates/layout.html  2010-03-09 14:20:18.000000000 +0000
++++ matplotlib-0.99.3/doc/_templates/layout.html       2010-06-03 20:12:02.164916326 +0100
+@@ -11,18 +11,6 @@
+ 
+ 
+ {% block relbar1 %}
+-<!-- Piwik -->
+-<script type="text/javascript">
+-var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/matplotlib/" : "http://apps.sourceforge.net/piwik/matplotlib/");
+-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+-</script><script type="text/javascript">
+-piwik_action_name = '';
+-piwik_idsite = 1;
+-piwik_url = pkBaseURL + "piwik.php";
+-piwik_log(piwik_action_name, piwik_idsite, piwik_url);
+-</script>
+-<object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
+-<!-- End Piwik Tag -->
+ <link rel="shortcut icon" href="_static/favicon.ico"> 
+ 
+ <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
diff --git a/dev-python/matplotlib/matplotlib-0.99.3.ebuild b/dev-python/matplotlib/matplotlib-0.99.3.ebuild
index aa94af03b23f5b9401dc2cb77e7b45fa0c32db30..f7919b67198ff17aac166d2e72b673ab7ff5a8ca 100644 (file)
--- a/dev-python/matplotlib/matplotlib-0.99.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.99.3.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/matplotlib/matplotlib-0.99.3.ebuild,v 1.1 2010/06/03 19:12:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.99.3.ebuild,v 1.2 2010/06/07 16:44:27 bicatali Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -85,6 +85,8 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-0.99.1.1-gtk-tooltip.patch
        # some font stuff (from upstream svn)
        epatch "${FILESDIR}"/${PN}-0.99.1.1-eintr.patch
+       # avoid slow piwik (bug #323005)
+       epatch "${FILESDIR}"/${PN}-0.99.3-nopiwik.patch
 
        # create setup.cfg (see setup.cfg.template for any changes)
        cat > setup.cfg <<-EOF
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index 06fea4ff94ec5c5c7a87d7cf606e6cd14357ed9a..862605d66f488000a7acffe408d9fd5e4af5999e 100644 (file)
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,6 +1,6 @@
-DIST mpmath-0.13.tar.gz 324959 RMD160 b379d88a494be862f57b01526745ae24f0e9b3f0 SHA1 2ae72cb66b4d22e9db9dd8c4a0f3ac9512671131 SHA256 abf336b083562848456796209f67aa9742af295e7fc82d9f44ef1ab7aeab39c7
 DIST mpmath-0.14.tar.gz 468606 RMD160 54b07c811cd1d9b7c4a9d1da91050dd921aa75f3 SHA1 94069d827d08f9547301e0faf04f0e2574a7dae5 SHA256 039c8649c926584c93e88b917908bfb512ceb4d124ba787f2aa14ecaf58f007b
-EBUILD mpmath-0.13.ebuild 981 RMD160 a2ce6c14deee5b3474ab4260cce29d423c2d7740 SHA1 6a3e0bc96f354cd3ab26faf13d26afd8742d1bce SHA256 a11e6d4d9938c8b5612594a6147b005c93c12d31a2baadc1bcd5b172074ac290
+DIST mpmath-0.15.tar.gz 514744 RMD160 cba11fc866e073d81de1482b0ebd451fef4cb861 SHA1 73d94ef01f2d50b50edfd2c1383e894663f792e4 SHA256 171cd91bccac0cb7e79c70b600cfe1cb2b419b1103fcc0828948178d10849ad1
 EBUILD mpmath-0.14.ebuild 1061 RMD160 a40c25b7ad67c0cf41f311e131f17780f052e513 SHA1 5926acb4e1d773a6162850e8e5ffcda426b55385 SHA256 3ff008a6851c612f34d208f857d57aa5c63decbd4b08d43cf4dca7ad0c24a1e3
-MISC ChangeLog 1793 RMD160 5d1c938fa6c592a8bb63c3c59b197d7d6c2b5341 SHA1 430226d64277dd36aefb5cc6cf13e1dd0596c39a SHA256 2640731c2a57bf10ca0cb5d2e8ecff8e8a7140c6ae7b989d871a50057f5c98ab
+EBUILD mpmath-0.15.ebuild 1060 RMD160 0938f20bf33cc899b9388c77d1a2fd89a6388c68 SHA1 3ffef14295b326e1f91fed87f056c462b5823c9a SHA256 9c4b9ae63b6e614fdbb2d93bb1d0ca9c47bd36caf3d17e53b1c7582d396c22ba
+MISC ChangeLog 1933 RMD160 3ffcbd4a290686727b0fa3fc54c75bd13432a7d7 SHA1 f308f69f5c43f710e1103df8d673b9d7b39670aa SHA256 da3446a2efba3a500111aa2ebd5fc9e7b588be6b9e268e35c813b50d2ab42c3d
 MISC metadata.xml 365 RMD160 ece7c524ccedeb12b39753fba601dd830c25f8ab SHA1 afc79096300fa102014e4e794fdc20814b25f363 SHA256 d6bb09b59c81f6643741decbdce8d164005673b406d703ce5c2448891b2db2a8
Unnamed repository; edit this file 'description' to name the repository.