From 1f575367f494d0918e34ad81ccd832bab066f744 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 9 Feb 2015 00:50:18 +0000 Subject: [PATCH] Revert widevine changes, which broke repoman Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- www-client/chromium/ChangeLog | 8 ++++- www-client/chromium/Manifest | 34 +++++++------------ .../chromium/chromium-40.0.2214.111.ebuild | 26 ++------------ .../chromium/chromium-40.0.2214.91.ebuild | 26 ++------------ .../chromium/chromium-40.0.2214.93.ebuild | 26 ++------------ .../chromium/chromium-41.0.2272.12-r1.ebuild | 26 ++------------ .../chromium/chromium-41.0.2272.16.ebuild | 26 ++------------ .../chromium/chromium-41.0.2272.35.ebuild | 26 ++------------ .../chromium/chromium-42.0.2288.6.ebuild | 26 ++------------ www-client/chromium/metadata.xml | 3 +- 10 files changed, 41 insertions(+), 186 deletions(-) diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 3cd9f254f71f..9fa4b4cfa77e 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/chromium # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1195 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1196 2015/02/09 00:50:13 floppym Exp $ + + 09 Feb 2015; Mike Gilbert chromium-40.0.2214.111.ebuild, + chromium-40.0.2214.91.ebuild, chromium-40.0.2214.93.ebuild, + chromium-41.0.2272.12-r1.ebuild, chromium-41.0.2272.16.ebuild, + chromium-41.0.2272.35.ebuild, chromium-42.0.2288.6.ebuild, metadata.xml: + Revert widevine changes, which broke repoman 08 Feb 2015; Jason A. Donenfeld +files/chromium-widevine.patch, chromium-40.0.2214.111.ebuild, diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 2b0004dd7110..70a3d336bfeb 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -19,31 +19,21 @@ DIST chromium-41.0.2272.12-lite.tar.xz 237786236 SHA256 7093674377a99a4c8f64e185 DIST chromium-41.0.2272.16-lite.tar.xz 237800940 SHA256 f90eaac9d316829f78069cc28f679bff31187026ba12e9910110829127743141 SHA512 b112dd131a0fedad761057b9e103f866ee72c8a199c2e489f1615f23eccb1502b7c54a59c8c2226d62f3f3dc9d9273b9546956a83d13e66e8005797e46ed63a2 WHIRLPOOL c5279b7cd15a73216f1de61fe960fc99dcae9c966ed01f08af3d8c3e7d4daa3e8882c16b6770b74f14c7e28f2d0d246b0230488de58d27d022c27d62db0eb6a6 DIST chromium-41.0.2272.35-lite.tar.xz 238139316 SHA256 7cb69ee8ecb1a16bb22999f1d33d309a022a27448cc5094f654c979910165698 SHA512 7e4f900e216775e58950c703a487022b84873af0c8813bfdd9d9a8801d90c99ed79de5796966583e1fe9c6ef064213040f5cb0be336bd237f86d563119f8be9f WHIRLPOOL 423400d406b2b3df14b5bc941ac5abd6e61e80d69cb5c81b01bf341c17ef6624f68091c114456808211b0e56441f81621789089a420c51456abcdf888a6da545 DIST chromium-42.0.2288.6.tar.xz 300774976 SHA256 f5295d0f00c5aca27bdbaf909e8c7cd7fff06b7a02c8d87ba2d77440e595fd16 SHA512 624cc4c358edfb7dd57de7ab22c901270ae0d0687a8ee54954fc675bb1927f54fe26348cae813ac6ce6a55b2939a4a650e258ea92cf798459c5ca96682f693f5 WHIRLPOOL 6838cb22b4a042e911abc4853bbfe8340157dbf1a9f45e9f0fb655c96a5e1f7a342263ba8007c7b93f97e50990708ddc8af3257a5a7a5db5cbf25f898faab69d -EBUILD chromium-40.0.2214.111.ebuild 19986 SHA256 284c4d54767f769d5e133273a7cf03da0f10b8bd519eb34cfc05a9f9f2b56a7d SHA512 70ddf890fc1c77882e09c90724d85baa0bc3458c930ff03f065a3cfcb2e278e4ff3e86ab239d3b9d78c4597fc94aa596479bdaaf25877dac0c2f8b163c2a5687 WHIRLPOOL b42d1a38b0ba3dc62585b1a4435607f70e9bab5c89ceea59d164ee52ae6997933fed7d126fdd01f95ce41e362df3422d9676b7fffdbbcb5d7ec2475261158bbf -EBUILD chromium-40.0.2214.91.ebuild 19979 SHA256 f5d392abb46f16c822338129ad311755409277d4a7e6c1973fd7a5c830521b9f SHA512 5ffe2089b1e248d7c03c84a22e7159817d09796fec13746bbdb9e78e80ae63a23b1700c9f355435b7bb17d821682a88007f8a75622136ac46ac27a4afb31cf0f WHIRLPOOL f05bab52e4d501f35a88642e04bf2fba0d92b4f44b8e04cc4fa43573160dfe754a587d71de109b3d99ea1e0890bd63713d0cbb9012e945e31afc2f4f31e92df5 -EBUILD chromium-40.0.2214.93.ebuild 19986 SHA256 c6084f2dfc31abba348ee47d5c12762a1b91041fde959bd2d870d919cece5164 SHA512 c4b6e30def95acc136db699b894e4095872d68169fc2f34e75c9be62cb01a4c2ef01621a9077f708c37f410dd5ccdc334c8d6252cc2f25102f1a2b7265d2d543 WHIRLPOOL 6795e384a67b9135e2c1f2184ff19414cd9c299aa689e017c961b90a009d262d68e6c867a34df74627fabe4fb9e99abe6e91e03b30e475fc8401bccd7f7d9790 -EBUILD chromium-41.0.2272.12-r1.ebuild 20149 SHA256 076e48a32e76eede47cc38348429dab4b6ea92851c0a87151116d5cf04402c38 SHA512 c0ee0cb69b1435d51164b618ffc8d9d1e2e95cd2ff3aec8cc8539e6a4d1796d67f9ef9ac96b84a55889ba2c0165b64e395b03c21cac9aa3b08a27147607042a8 WHIRLPOOL a0e5c819ec4271b0a51a7720b00a6d53253b2f9241b29e849c32053191a566a785d25745df0643c2c1fc3d2b21e44e02ce55f798fcea78009a9ba310f6920e9c -EBUILD chromium-41.0.2272.16.ebuild 20146 SHA256 15dfcc36b5128a4914c6d0f393ca4359daa453a6bac1063c8a3f325e5d4b735a SHA512 3f9841ba49d5a44fba65697ff7e8e9f92c20b5aad99c6744a376f2454b8e45c8930905635b9f5a5a2f19597748da4d24d27d34e6fc2036b66ab6cc3923c78576 WHIRLPOOL e20040d258970e8dc754cd4b7a0185c2e62cb9fa6b4c39d6463cdc6bf3466b9bd89cec800b05312eddf7c416c3a80a940bb88f1f1fbfff567d72f6dd158ca25a -EBUILD chromium-41.0.2272.35.ebuild 20146 SHA256 712ee024907405c5c7e6b9710165d2dea9026b14bafd126112057b9c7ed8fcc6 SHA512 73b1613f5729c039d8aea80b16a1ed6f1f4f88311a3ac0c48a5fbbba2fccbd5c7f85bb433f7dc85139cf13022adcb5267d8786c37f115c1ab960d79f28f4530e WHIRLPOOL b58c4bf814956322a5f4b6e5368104474096aa951d21db6342a39557cb7db61f189a5b2b9daf3358571728ff0beaf55b523a0315549f4abba7430d6830b9820f -EBUILD chromium-42.0.2288.6.ebuild 20191 SHA256 3aa84cd916827a1cbd06d1c7536a60afb34a744a6d1b338c0b69cb908ac6275b SHA512 34099dcb7ef9370970ca6ca282ee213335571da592a5e0d114b14f47363f5f948bf7da65637e72a20ebe4dbc260bb15e735de2717fe3e997e713f9e409bed195 WHIRLPOOL 9fa016d592cdf2cd8426dfc5c7507f73f7898ee96835ebb8f9a7a294e1307d81b54086ec0a04e303c313a7b5e00a4d061cb2850f4a6ffe2f5c5a2c7fa890c96a -MISC ChangeLog 3915 SHA256 f600b1ff1891443e187375c7fa943c47bec132f1924925dd2ef4646fbb610563 SHA512 0132cab8ba9de7cbc2b1bfc29d81aef7e8df33ca9a6ea12b35649d1eeae692ecf2ccd9cd4a7778293d67a6a2df9ed4442d11440443ff3f266485ec16eb058c55 WHIRLPOOL 95aa4a20566f27ee749abc23be9232c37a0c5c22cf39c308d0c9907b29f690e362002741b3965b7d947df1991b5131f549f5cbf0ce04deb6fdbdef7f742b7304 +EBUILD chromium-40.0.2214.111.ebuild 18998 SHA256 24aa56ae0d4438975481c3d291f339f4ec40ecf65d7b27d9f2f1744b733cc897 SHA512 713aae4407d1d45510ddbdb90911863d2d544a381317bcead18fc04da16dfd4caa56a046e21a86cf98338d14a6145a183c346358afb3e9dcd9e0412f4151fd33 WHIRLPOOL bf90f86ad02eca421b9761b3b4b550b5f74d96d6c11a1ce4e30c2fe432bd8170c66399aaeabaf5abc89e2f7fad9c1adc3d64cce65912499482aad1684a57efc0 +EBUILD chromium-40.0.2214.91.ebuild 18991 SHA256 9686092a41afcaa18f618f86e1b659bd6b1206267fa4e0de0454a3475bce9cf0 SHA512 117bfb6a801a28f3c5054f47ec527a93521a0c87c4ff4ac1a18b92dc5c1907876fa54b5f8af154e9a04ec4aeb01653f3ae202b8f0a36171d85e41b9ec35ab58d WHIRLPOOL 47d6dedc038f4c2f2c6c6fd5e707bcdb2adcb2417dec71193d3742c718a9e48a295956f154ca39377519fa73895546b2922d662567e508a3f79dabb3a7873e2e +EBUILD chromium-40.0.2214.93.ebuild 18998 SHA256 299aa0152656f4fcd835f2e08aa5466922ce4df98f3ba08ea4303608943a7017 SHA512 fdb695d6544114e2e0cc368bf6acc2cbe78929a04a861afaeacc5723170fa309d14155f3344bf5eb1abb99bf62ef5d192ad955148cd95e5d8c1f7f9bdaac2b9e WHIRLPOOL e9b24b127054cf9fe6f159e41ac5a047cd71849283854f3efca68d73335612bcf376386431191403d95fec8d4931d7d47c09a6060c7849767195b40c93d265ce +EBUILD chromium-41.0.2272.12-r1.ebuild 19161 SHA256 450169221191425da9f364eb65142dd0e2d7eec3f037f192ca6bdf962a678139 SHA512 e6b925543e6c8f00febb001192bfe41c60f1f3360e1156e6c33cd7f941cd30e05ee8dbf818c1522e80bd562ca6fd1fa484f514cef0481f3fc2f944c4a41997cc WHIRLPOOL 0f55f7e335384151775b4735139b0757ac2c4de77d1a31861de9865456ae5e1bacf08d95123c28c4fe1bedd4325e3597dafc59498b65b03e9b9ff54b960b7eb1 +EBUILD chromium-41.0.2272.16.ebuild 19158 SHA256 605d4aabbdc0c491e0cfdb740d653bd68bdd4f1879340f0bf4eb5231507c03d2 SHA512 09f4100979bfbaa8df1877960860eda99fc66a3302f77e206abd4ccb07654289b8e157750310920b60a321c1ffac0df8637cf4b6654854717d1bcb19a12af07e WHIRLPOOL ea8e1e360c59a45315625298b9ce43c7b93979cf29b60540fa53d4c8b837e2e233c033686c718db09ff3390354454b51800d8080c34b5264e56f336eb04127ed +EBUILD chromium-41.0.2272.35.ebuild 19158 SHA256 0f8bf4e5422d3e49c7724052bcbac7632d89d01c0d186f79e92fde1ec51b7a56 SHA512 f6ea5d3adc0f8aba35e6bf6f6419f076be5d2117a943a087f2e18285c1e7823e60c78029f280109e5aacc4bedd0694d50f543387d2fe111048f4f965a7af92d1 WHIRLPOOL 9e994977e45f2d2e616bcbf1235de83ba62fff92fedd423ca228978af0c0904303bcb20531dbcf28c129312a4d3d7670c34e402de475affc9542d1cb519ab63e +EBUILD chromium-42.0.2288.6.ebuild 19203 SHA256 f04fc53cb93e33506301d865f3335fd4ba94c62dc69050d485d4b0931d60e88e SHA512 bcc42cc508ec632dc8cd7643d7cb1b5f2dc4d7d1dfb194c44a49b8a05229450b2cc408f922310b349bd0383d93c94212aa4a74a63bd4dc70937b9e5c7019b74e WHIRLPOOL 616da55de3b2a0fdbf2219b1b02e65c3c81261f1f8b3f165e4607420f28440d6b85565ce222547920db707565f12d56b6322d4a24cd64c3e1ca222776e14df0f +MISC ChangeLog 4247 SHA256 ea695b94c94c0415d9efb2f32ef456a585948fa5a37a34e3b885ecf4e26c145c SHA512 37d3408d0a55e0ec20546cea22d4ee148ea7b20c4ed9f109730696c032f44c78392a67a962ad026b01cf91bf6bfb91fbccc94836dfe9b71dbf10404e973b68ba WHIRLPOOL e5e23f4ff10601c8fc86a10aaf780eeba60b5ce47edd07cd7c4efc1ee88d5ed6dbd87564f25ebaf5b1f2e81d80b6399fc44b0d1976df79a9c2c090cfc58026e8 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea -MISC metadata.xml 719 SHA256 117ed0ae00e9775e965ade43a16850af4d8d7bd95f57958fbfee8bd10dfa518c SHA512 da7c1cc9f12575f66ce9380fef908afaede1e923841fecf2e292a1dad9de7ac3e697e47ebd607b6285170bd71ce8744b832ac1cd73692f78371d93de5aacdd14 WHIRLPOOL ce1c59c31598f1d5457e74247d04f9da7f0396146a736847f27084f3bd6e4e008f872b7f12ee9f762dc9bae40767f5ed6cf2868facb1d3e228b535b7fe1e6573 +MISC metadata.xml 610 SHA256 fab56e56102853f58a4078b6812b4af31aed0069921ce51200d40c88d813b9ac SHA512 37dcf9426553269dd961565bfb3ff23793b19a5ba12d1909f6392a9514cdaae39c4a8d4d450a7be757425a0deb67f63e81ace513716bf9960f2e64fd373c8986 WHIRLPOOL a2f576b167d68fbf0ca658ecd7ef957ae41823493624b903198505a506ccec27ffbccd4db3a609d7ad2e72b98ad81ff79b2ddd60137821cbf155af4b8b650cd5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU15I9AAoJEEn8cBKl3gOu7UkP/jRt7lu0mqnaSrH4BvKVEnyK -UkSweyaXEaw6looROrAmgRgkvB+oTdQqjEKwl8pjvRI/KgYCBT/lJGBDTa2pdMyD -dIINklgQaw8lsCiD4NXuJGKjAppCtTDMiNhxKZe57PEgpwnXnUos83s8Ggx3yspi -qG2aNnXPimbyAaqvJhpaia8JdjfOCdP5tuU9e5EloYevRI66YFa1S4L7CePaHKHJ -1qbJ7pezqWg4WFw2AX7H04b1nk295qbGRI4Q3R96ftrETFZoHTGaATqqOKCqD2Hh -0vjU6hBDmpjtndOVg3gXcXsuLT8goAFZvI3yr21UE9UONoA2LCzxVEUivxf+R8G/ -K5ItCA29ZsgA8hfd9L8oEcYLGvKSXBiWp+WE8xuv3cRxii8MhHJ1zXVZS9698yz7 -I9ZZ2HvrNgTC9X3DNCt9D9qTCjSLRjEPix3e7KyOiP9duWWMLdBnzxWko8ATjr2h -mnBpvbW/GphDytsvzer02wvT8aI0pjiF1F4wXNKEbfjSCI61rzzvIVUfLkM0DpI9 -VBM0HDcwYAxSWFry9uFUa4Wp+7DCVxj/ZDwEoDru1VpKpdAVYGGpFJvTke1bM3bg -2bWqiP+JKi2ENTqjb2A1OgLP/P1U04NEvbw+yOKKU79hYmP3uy7qq/UyLpjKntzO -JdjCUHCOzOkYBOCTBc1r -=Xa/0 +iF4EAREIAAYFAlTYBEkACgkQC77qH+pIQ6StugD+K7xG3WikowO8X9+M0PmKYydQ +j/OoQuWOeFzkbLmgfdIBAK3ge6mtvxP9QnpR0Dse8ItKSyMZ6agjPhFZUog2krAT +=QkHy -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-40.0.2214.111.ebuild b/www-client/chromium/chromium-40.0.2214.111.ebuild index b45e8602a4a1..6aca7777b907 100644 --- a/www-client/chromium/chromium-40.0.2214.111.ebuild +++ b/www-client/chromium/chromium-40.0.2214.111.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-40.0.2214.111.ebuild,v 1.3 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-40.0.2214.111.ebuild,v 1.4 2015/02/09 00:50:13 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc widevine" +IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc" RESTRICT="!bindist? ( bindist )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -94,11 +94,7 @@ DEPEND="${RDEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - virtual/pkgconfig - widevine? ( www-plugins/chrome-binary-plugins[widevine] )" - # We build-dep on having widevine, because the patch - # below must extract the current version. - + virtual/pkgconfig" # For nvidia-drivers blocker, see bug #413637 . RDEPEND+=" !=www-client/chromium-9999 @@ -191,19 +187,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-cups-r0.patch" - if use widevine; then - local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" - [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version." - sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" - local arch - for arch in $WIDEVINE_SUPPORTED_ARCHS; do - mkdir -p third_party/widevine/cdm/linux/$arch - cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." - done - fi - epatch_user # Remove most bundled libraries. Some are still needed. @@ -588,9 +571,6 @@ src_install() { doexe out/Release/libffmpegsumo.so || die doexe out/Release/libpdf.so || die - if use widevine; then - doexe out/Release/libwidevinecdmadapter.so || die - fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/chromium-40.0.2214.91.ebuild b/www-client/chromium/chromium-40.0.2214.91.ebuild index b0ef4b2ad227..2af5b55b3348 100644 --- a/www-client/chromium/chromium-40.0.2214.91.ebuild +++ b/www-client/chromium/chromium-40.0.2214.91.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-40.0.2214.91.ebuild,v 1.4 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-40.0.2214.91.ebuild,v 1.5 2015/02/09 00:50:13 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc widevine" +IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc" RESTRICT="!bindist? ( bindist )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -94,11 +94,7 @@ DEPEND="${RDEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - virtual/pkgconfig - widevine? ( www-plugins/chrome-binary-plugins[widevine] )" - # We build-dep on having widevine, because the patch - # below must extract the current version. - + virtual/pkgconfig" # For nvidia-drivers blocker, see bug #413637 . RDEPEND+=" !=www-client/chromium-9999 @@ -191,19 +187,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-cups-r0.patch" - if use widevine; then - local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" - [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version." - sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" - local arch - for arch in $WIDEVINE_SUPPORTED_ARCHS; do - mkdir -p third_party/widevine/cdm/linux/$arch - cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." - done - fi - epatch_user # Remove most bundled libraries. Some are still needed. @@ -588,9 +571,6 @@ src_install() { doexe out/Release/libffmpegsumo.so || die doexe out/Release/libpdf.so || die - if use widevine; then - doexe out/Release/libwidevinecdmadapter.so || die - fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/chromium-40.0.2214.93.ebuild b/www-client/chromium/chromium-40.0.2214.93.ebuild index d774e7a48ee2..9550de87d5ea 100644 --- a/www-client/chromium/chromium-40.0.2214.93.ebuild +++ b/www-client/chromium/chromium-40.0.2214.93.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-40.0.2214.93.ebuild,v 1.2 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-40.0.2214.93.ebuild,v 1.3 2015/02/09 00:50:13 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc widevine" +IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc" RESTRICT="!bindist? ( bindist )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -94,11 +94,7 @@ DEPEND="${RDEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - virtual/pkgconfig - widevine? ( www-plugins/chrome-binary-plugins[widevine] )" - # We build-dep on having widevine, because the patch - # below must extract the current version. - + virtual/pkgconfig" # For nvidia-drivers blocker, see bug #413637 . RDEPEND+=" !=www-client/chromium-9999 @@ -191,19 +187,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-cups-r0.patch" - if use widevine; then - local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" - [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version." - sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" - local arch - for arch in $WIDEVINE_SUPPORTED_ARCHS; do - mkdir -p third_party/widevine/cdm/linux/$arch - cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." - done - fi - epatch_user # Remove most bundled libraries. Some are still needed. @@ -588,9 +571,6 @@ src_install() { doexe out/Release/libffmpegsumo.so || die doexe out/Release/libpdf.so || die - if use widevine; then - doexe out/Release/libwidevinecdmadapter.so || die - fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/chromium-41.0.2272.12-r1.ebuild b/www-client/chromium/chromium-41.0.2272.12-r1.ebuild index 474ad4c63e32..2af05c72656f 100644 --- a/www-client/chromium/chromium-41.0.2272.12-r1.ebuild +++ b/www-client/chromium/chromium-41.0.2272.12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.12-r1.ebuild,v 1.2 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.12-r1.ebuild,v 1.3 2015/02/09 00:50:13 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc widevine" +IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc" RESTRICT="!bindist? ( bindist )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -94,11 +94,7 @@ DEPEND="${RDEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - virtual/pkgconfig - widevine? ( www-plugins/chrome-binary-plugins[widevine] )" - # We build-dep on having widevine, because the patch - # below must extract the current version. - + virtual/pkgconfig" # For nvidia-drivers blocker, see bug #413637 . RDEPEND+=" !=www-client/chromium-9999 @@ -191,19 +187,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-cups-r0.patch" - if use widevine; then - local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" - [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version." - sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" - local arch - for arch in $WIDEVINE_SUPPORTED_ARCHS; do - mkdir -p third_party/widevine/cdm/linux/$arch - cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." - done - fi - epatch_user # Remove most bundled libraries. Some are still needed. @@ -592,9 +575,6 @@ src_install() { doexe out/Release/libffmpegsumo.so || die doexe out/Release/libpdf.so || die - if use widevine; then - doexe out/Release/libwidevinecdmadapter.so || die - fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/chromium-41.0.2272.16.ebuild b/www-client/chromium/chromium-41.0.2272.16.ebuild index 923fa8aba626..7f8b21e37f98 100644 --- a/www-client/chromium/chromium-41.0.2272.16.ebuild +++ b/www-client/chromium/chromium-41.0.2272.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.16.ebuild,v 1.2 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.16.ebuild,v 1.3 2015/02/09 00:50:13 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc widevine" +IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc" RESTRICT="!bindist? ( bindist )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -94,11 +94,7 @@ DEPEND="${RDEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - virtual/pkgconfig - widevine? ( www-plugins/chrome-binary-plugins[widevine] )" - # We build-dep on having widevine, because the patch - # below must extract the current version. - + virtual/pkgconfig" # For nvidia-drivers blocker, see bug #413637 . RDEPEND+=" !=www-client/chromium-9999 @@ -191,19 +187,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-cups-r0.patch" - if use widevine; then - local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" - [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version." - sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" - local arch - for arch in $WIDEVINE_SUPPORTED_ARCHS; do - mkdir -p third_party/widevine/cdm/linux/$arch - cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." - done - fi - epatch_user # Remove most bundled libraries. Some are still needed. @@ -592,9 +575,6 @@ src_install() { doexe out/Release/libffmpegsumo.so || die doexe out/Release/libpdf.so || die - if use widevine; then - doexe out/Release/libwidevinecdmadapter.so || die - fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/chromium-41.0.2272.35.ebuild b/www-client/chromium/chromium-41.0.2272.35.ebuild index 60185f1afbcf..2367617f9a3c 100644 --- a/www-client/chromium/chromium-41.0.2272.35.ebuild +++ b/www-client/chromium/chromium-41.0.2272.35.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.35.ebuild,v 1.2 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.35.ebuild,v 1.3 2015/02/09 00:50:13 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc widevine" +IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc" RESTRICT="!bindist? ( bindist )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -94,11 +94,7 @@ DEPEND="${RDEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - virtual/pkgconfig - widevine? ( www-plugins/chrome-binary-plugins[widevine] )" - # We build-dep on having widevine, because the patch - # below must extract the current version. - + virtual/pkgconfig" # For nvidia-drivers blocker, see bug #413637 . RDEPEND+=" !=www-client/chromium-9999 @@ -191,19 +187,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-cups-r0.patch" - if use widevine; then - local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" - [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version." - sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" - local arch - for arch in $WIDEVINE_SUPPORTED_ARCHS; do - mkdir -p third_party/widevine/cdm/linux/$arch - cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." - done - fi - epatch_user # Remove most bundled libraries. Some are still needed. @@ -592,9 +575,6 @@ src_install() { doexe out/Release/libffmpegsumo.so || die doexe out/Release/libpdf.so || die - if use widevine; then - doexe out/Release/libwidevinecdmadapter.so || die - fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/chromium-42.0.2288.6.ebuild b/www-client/chromium/chromium-42.0.2288.6.ebuild index 2acc4f6899ed..373f965f1278 100644 --- a/www-client/chromium/chromium-42.0.2288.6.ebuild +++ b/www-client/chromium/chromium-42.0.2288.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2288.6.ebuild,v 1.2 2015/02/08 16:43:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2288.6.ebuild,v 1.3 2015/02/09 00:50:13 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc widevine" +IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc" RESTRICT="!bindist? ( bindist )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -95,11 +95,7 @@ DEPEND="${RDEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - virtual/pkgconfig - widevine? ( www-plugins/chrome-binary-plugins[widevine] )" - # We build-dep on having widevine, because the patch - # below must extract the current version. - + virtual/pkgconfig" # For nvidia-drivers blocker, see bug #413637 . RDEPEND+=" !=www-client/chromium-9999 @@ -192,19 +188,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-libsecret-r0.patch" - if use widevine; then - local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" - [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version." - sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" - local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" - local arch - for arch in $WIDEVINE_SUPPORTED_ARCHS; do - mkdir -p third_party/widevine/cdm/linux/$arch - cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." - done - fi - epatch_user # Remove most bundled libraries. Some are still needed. @@ -594,9 +577,6 @@ src_install() { doexe out/Release/libffmpegsumo.so || die doexe out/Release/libpdf.so || die - if use widevine; then - doexe out/Release/libwidevinecdmadapter.so || die - fi # Install icons and desktop entry. local branding size diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml index ef3645a3905b..97dfb1f43a68 100644 --- a/www-client/chromium/metadata.xml +++ b/www-client/chromium/metadata.xml @@ -7,7 +7,6 @@ Disable patent-encumbered HTML5 video codecs Enable support for high-resolution screens (high dots per inch) Disable optimized assembly code that is not PIC friendly - Use bundled tcmalloc instead of system malloc - Add support for the Widevine DRM module from www-plugins/chrome-binary-plugins + Use bundled tcmalloc instead of system malloc. -- 2.26.2