summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-12-25 01:19:34 +0000
committerMike Gilbert <floppym@gentoo.org>2013-12-25 01:19:34 +0000
commit1e26747952e91f0ca52dccd5c91b13b1ca3cd8ad (patch)
tree3b9b50d15e7ea90231667f0f7ba5eea3897a8169 /www-client/google-chrome
parentversion bump (diff)
downloadhistorical-1e26747952e91f0ca52dccd5c91b13b1ca3cd8ad.tar.gz
historical-1e26747952e91f0ca52dccd5c91b13b1ca3cd8ad.tar.bz2
historical-1e26747952e91f0ca52dccd5c91b13b1ca3cd8ad.zip
Bundle a copy of libgcrypt, bug 494596.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'www-client/google-chrome')
-rw-r--r--www-client/google-chrome/ChangeLog7
-rw-r--r--www-client/google-chrome/Manifest16
-rw-r--r--www-client/google-chrome/google-chrome-31.0.1650.63_p1.ebuild10
-rw-r--r--www-client/google-chrome/google-chrome-32.0.1700.68_beta1.ebuild10
-rw-r--r--www-client/google-chrome/google-chrome-33.0.1750.5_alpha1.ebuild10
5 files changed, 42 insertions, 11 deletions
diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 6787c8ab8c4d..393c47f3f4d7 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-client/google-chrome
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.356 2013/12/20 00:26:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.357 2013/12/25 01:19:31 floppym Exp $
+
+ 25 Dec 2013; Mike Gilbert <floppym@gentoo.org>
+ google-chrome-31.0.1650.63_p1.ebuild, google-chrome-32.0.1700.68_beta1.ebuild,
+ google-chrome-33.0.1750.5_alpha1.ebuild:
+ Bundle a copy of libgcrypt, bug 494596.
*google-chrome-33.0.1750.5_alpha1 (20 Dec 2013)
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 8c76b3ac851c..21b18f5fa119 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -7,15 +7,17 @@ DIST google-chrome-stable_31.0.1650.63-1_amd64.deb 48652464 SHA256 126972e0643ec
DIST google-chrome-stable_31.0.1650.63-1_i386.deb 46217932 SHA256 aa94f2a05bcb52d1c50f0cb84bddd0dc8f2b69c5bbd89428408eb8db5813f62d SHA512 a88b86f9309939a4ba31655e54b8d8ded523f4bbcd8466e7a9f8b21dc7afdd87c60ea890f6c4c6c51678e50fcd093f5866042e496b78da40bea25407884fa4b1 WHIRLPOOL 4c0a618d6456fffbf60a3e630c79567b626260d342d45861a26ad23e21567f6a2dd308be14ecfeaa24bb721ee77acc3e96d052760644d6111ba8b65d373ba597
DIST google-chrome-unstable_33.0.1750.5-1_amd64.deb 50474152 SHA256 39f2123a941a5a6f6378425df9696fdba9918d3942a4ab0be8ae55ede6404b57 SHA512 3e00d512731ef08b533ce5ba9c9123420d9a05fc582d73fec7ca4acffd838efb2a8768d8ab372beeb0703c696c92e8ab5cfa6bbb7575ff26de5f8ddbd549d749 WHIRLPOOL 641bf79cf0f2303149f4dfae8dd2f6bbb173cbeb3009318198ffaf068da4d3c19491ecadf98bd652bf868e1ee3f328bdf04247786d7c3bb8390e1eec3b0163e1
DIST google-chrome-unstable_33.0.1750.5-1_i386.deb 47902352 SHA256 ad9daf1a4201d0d55a81b5b6940c7604e2d2bf686f4b7655f86631ff0bfdaa85 SHA512 899b1f27187817ee179b4d1103140bdd19f543140d07ee28317e4910cdb77197b8765af8eb9fd7820fa3f52fce4e372c523f9337380dbf4eec78ee0d9ae9cc36 WHIRLPOOL 7ee15ac0760053f3a398f6fb873cdb24ed0ed68a8d54d8d8639dae7e1eb02d1039b40fdbdda1b34cd81736a257fb9a885d4dd96fa4a843a4ab070c44966251e2
-EBUILD google-chrome-31.0.1650.63_p1.ebuild 4433 SHA256 5c14cb3dbebab625c15adab9811dcd7efe34cb5c045c8b8f3011299bcb1a44e2 SHA512 085d79104900a7976596ab600a569e6b4b7d327d38bd84bed4746ff3744d6860af55be95f680f2d738427e0ddc31a4961925534cb77ada2a76c03cf17419f0c2 WHIRLPOOL 91243b45f6a5c2e3846b331551c43c8ba73a1280418ce0ff04fe828558f7dafd76427e8fdd0f42ffee67fd1d004212ecc640c6d6eb028825424d7d9dd1d1354d
-EBUILD google-chrome-32.0.1700.68_beta1.ebuild 4390 SHA256 7c73f9681cb83751dd08672d58927d95904db3488cc80c928fafd5be5750c5c0 SHA512 9b824cc4590d1f98ad63a309205ac7501e9561784f5b9910abdc44abf7512350148ddf27f49cba5abde0b2a508aad15e1c2fa26f9c6ae6627e373b0f4da9c27f WHIRLPOOL 17b4b7fdcd817f0574947ca79ccf097fcc2f0ca8ffb37d6daf398661121ccee45eee427466e2f553b38918cd3d2fc24436c014a8ff21f48eb1e43ed92a18ef0c
-EBUILD google-chrome-33.0.1750.5_alpha1.ebuild 4440 SHA256 69420962566531b0e1f1b88a75756c03fc0fa51b519bf8ea0cb7506ff249a4ad SHA512 8ef3aa8360e802c4947b226558ec9b8f09082c6b72160ed9c317b491c3adb0f8dcc73e978aaf1e271f647623796d9ddc964fdb74d0a9c174c76162ab88e89825 WHIRLPOOL 201eb85382a42f7313dee5b56e7c1c5551fe090d70079b1168a3bfb3589d6e70961398407f0c5ce3fe8e04e827e37a30806f053a4540ef5b2b2cc16c197d3bb0
-MISC ChangeLog 86580 SHA256 eacfc66817e21a85164f68695129f801e129d6e657ec725164d2eb246c2ce2a2 SHA512 bffc1aa8526fd34e026f80b3bec65733ff517fd79775bb8d27cd9ff552f160c7713b5fa4930ef66a6722e6ab1df80b51debc330cf38c2780c8e0013ee6fd13b8 WHIRLPOOL 1b1daf2741103e0255c61ad090aca4dba36206067125758a5d1214d4069828c82f3ec9900b79f7f63732713de9b7cf4d216eb53b831f534798961adaddc217e1
+DIST libgcrypt.so.11.8.2-amd64.xz 211916 SHA256 b83ef0cae62318f1c60c464daf8cfd77c35e4d931d8be79490098cc494ba2c00 SHA512 d350c0e78185b142434cd26887eebdf3d836e2e3e2c4114c5571f0f4f23daebb65875195779c95b3b8ca88a77bfa01009cb1e08bc79b45705978dae70bd4f03f WHIRLPOOL 4e1f9b55765a2c40e54e79d0c7ab53645fbc25417bde2d511f91858d068fd8cba83eb76ca716e2a51dc4c2ed3d887e55f53391c3a38edc9fb6e18c6ac420117e
+DIST libgcrypt.so.11.8.2-x86.xz 210568 SHA256 cc3223c2edc6ed9c1fca7a198c0444d752685553319245618252594c01958049 SHA512 3ae308c0842f7d188c73933d9ab52cb3186310eb7225b9bbaee05596b70431c8ab52d1723611a7db51d5d9e4e3ec9b9f69836ce0f4b394f9b3ec148da82b1176 WHIRLPOOL 4b34cd97a5925dc54e5fa4d42d447e490ae2334efec6d25822095c7869b7bdf89c64cc9a43ff7440955e49300c0e2a69f73137c0f2c44cbf7aa9babf6679708f
+EBUILD google-chrome-31.0.1650.63_p1.ebuild 4727 SHA256 4ead8cee94947e833be2f1a0ff57acd0eb1eca4a2f525a7f7f8928617927d067 SHA512 7c3cb2386284e23605586f6037ad5077122afe52adb42aafea4b02b2e67ae73d40db3e72ac1972948f6fd560e916e43e569dbbe3e6b2084c85f6c886741f424f WHIRLPOOL 9199a540b52690139bcb4af769ead80ffb1026f83c2325e2629e2433ee3141c142539080d842ea83e35cfff1180d53893d05a8611ccd6539541bbf0355e95def
+EBUILD google-chrome-32.0.1700.68_beta1.ebuild 4684 SHA256 7d4670a48f1155d706cadaa24de771fac508311c830d397c2a4793eb6f70bf45 SHA512 4deeea835452d1a9b9dfdd3cc3add9c73d8e2430bbdf9509f38e1318b52363d60703aeca081799a6a137bc1d3782ac836d6d0cd8c494877feedc8507dc75884c WHIRLPOOL 3dd1abd0c930c05c9987b8f74bc43717abcad7446a5ba8261125a3b8a8ac0e9e788d45c8cf9d1538605b53360736bb94e314ff95dff8ab27e7781793696783db
+EBUILD google-chrome-33.0.1750.5_alpha1.ebuild 4734 SHA256 7bb78152637ba088df6c6a087b8d4b720a590e56f87bd63de8661ace918877dc SHA512 7c71b8406cd521a77761d6d31132be7278176bc63647b80a8a1dc0a1d05028b7c6e21029910e3633b805e3b814ee863a025158c05199f54d2bb69f4b298226a5 WHIRLPOOL 6e2985d27e46ac9f0e10a697774a24e1c35dbc5f974c82bf7933664c23ad282c6a78d7cbc2f18c0f93f2350962a3eecde83c4cabed72025a04eddd474df09576
+MISC ChangeLog 86796 SHA256 5c9af905a025cfe934fec7da9749de65f478fc8fd95567b6c14f8b107cc61235 SHA512 e0b84c1fb9136680e76fa611a7901081abc971abd426888baa1296b287e6de46e1800b4fe26a4917970b255ed1952d0b2861c8344d561b1ef0e07da3023149a6 WHIRLPOOL d2b9b10b9e26bd120181b8744ef86944e8b34b27b4420892cc95a372c8bc3935e7c62e8e3a1e99087c2d0cb3861d2817cec034e337492401d4d026c44d4640b9
MISC metadata.xml 600 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806 SHA512 350bb629bee41ac320d1a870d3d7f34ead23edb1b7cf6ac6379363b01435015c58e249ba1375e9ed3b3023107ef5f3f29f646143a9e2622769923aa5fb21d846 WHIRLPOOL 05772be4e662813e5a0231e46d272931f0ccce9a13f7244ddda8a40e43e8d141293d0a70d4aa8b640ace773d3f68d663bd8cd4558f3bc3c65e5126834bf05129
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iF4EAREIAAYFAlKzjrIACgkQC77qH+pIQ6SLYwD+OgZ3eC0tPCVVQVSpxc5ME14i
-JGkEk3yArh+nKqUl3mYBAKcpH0r6AZuohgDTR4PHf7wWtOpnaYKzo+spG+Fj4vQ8
-=iTb/
+iF4EAREIAAYFAlK6MqYACgkQC77qH+pIQ6RRXwEAqPIvrnEkVIYFnLW2o29gne+B
+D9pbH7U0kTu9To5mF2QBALw/w/FS2KxIkSH2PEvOfbo8/1gMw517Cu35B50e07Bq
+=mgA6
-----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome/google-chrome-31.0.1650.63_p1.ebuild b/www-client/google-chrome/google-chrome-31.0.1650.63_p1.ebuild
index 5bf4e4b442c5..c8b3b4bbd584 100644
--- a/www-client/google-chrome/google-chrome-31.0.1650.63_p1.ebuild
+++ b/www-client/google-chrome/google-chrome-31.0.1650.63_p1.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/www-client/google-chrome/google-chrome-31.0.1650.63_p1.ebuild,v 1.1 2013/12/04 20:32:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.63_p1.ebuild,v 1.2 2013/12/25 01:19:31 floppym Exp $
EAPI="4"
@@ -34,12 +34,17 @@ esac
MY_PN="${PN}-${SLOT}"
MY_P="${MY_PN}_${MY_PV}"
+# Bundle a copy of libgcrypt, bug 494596
+LIBGCRYPT="libgcrypt.so.11.8.2"
+
SRC_URI="
amd64? (
http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+ http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-amd64.xz
)
x86? (
http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+ http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-x86.xz
)
"
@@ -156,6 +161,9 @@ src_install() {
newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
done
+ insinto "${CHROME_HOME}"
+ newins "${WORKDIR}/${LIBGCRYPT}-$(usev amd64)$(usev x86)" libgcrypt.so.11
+
readme.gentoo_create_doc
}
diff --git a/www-client/google-chrome/google-chrome-32.0.1700.68_beta1.ebuild b/www-client/google-chrome/google-chrome-32.0.1700.68_beta1.ebuild
index 442ead3e4b39..473e8fd88f14 100644
--- a/www-client/google-chrome/google-chrome-32.0.1700.68_beta1.ebuild
+++ b/www-client/google-chrome/google-chrome-32.0.1700.68_beta1.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/www-client/google-chrome/google-chrome-32.0.1700.68_beta1.ebuild,v 1.2 2013/12/19 04:16:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-32.0.1700.68_beta1.ebuild,v 1.3 2013/12/25 01:19:31 floppym Exp $
EAPI="4"
@@ -34,12 +34,17 @@ esac
MY_PN="${PN}-${SLOT}"
MY_P="${MY_PN}_${MY_PV}"
+# Bundle a copy of libgcrypt, bug 494596
+LIBGCRYPT="libgcrypt.so.11.8.2"
+
SRC_URI="
amd64? (
http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+ http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-amd64.xz
)
x86? (
http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+ http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-x86.xz
)
"
@@ -155,6 +160,9 @@ src_install() {
newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
done
+ insinto "${CHROME_HOME}"
+ newins "${WORKDIR}/${LIBGCRYPT}-$(usev amd64)$(usev x86)" libgcrypt.so.11
+
readme.gentoo_create_doc
}
diff --git a/www-client/google-chrome/google-chrome-33.0.1750.5_alpha1.ebuild b/www-client/google-chrome/google-chrome-33.0.1750.5_alpha1.ebuild
index c4d0030134cd..3f537d8bf594 100644
--- a/www-client/google-chrome/google-chrome-33.0.1750.5_alpha1.ebuild
+++ b/www-client/google-chrome/google-chrome-33.0.1750.5_alpha1.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/www-client/google-chrome/google-chrome-33.0.1750.5_alpha1.ebuild,v 1.1 2013/12/20 00:26:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-33.0.1750.5_alpha1.ebuild,v 1.2 2013/12/25 01:19:31 floppym Exp $
EAPI="4"
@@ -34,12 +34,17 @@ esac
MY_PN="${PN}-${SLOT}"
MY_P="${MY_PN}_${MY_PV}"
+# Bundle a copy of libgcrypt, bug 494596
+LIBGCRYPT="libgcrypt.so.11.8.2"
+
SRC_URI="
amd64? (
http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+ http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-amd64.xz
)
x86? (
http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+ http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-x86.xz
)
"
@@ -156,6 +161,9 @@ src_install() {
pax-mark m "${ED}${CHROME_HOME}/chrome"
dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0"
+ insinto "${CHROME_HOME}"
+ newins "${WORKDIR}/${LIBGCRYPT}-$(usev amd64)$(usev x86)" libgcrypt.so.11
+
readme.gentoo_create_doc
}