From: Jeroen Roovers Date: Tue, 20 Apr 2010 15:38:07 +0000 (+0000) Subject: Version bump . Do... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86792b3202ccfa97bfd987c6c9cd5a7d2a3345cc;p=gentoo.git Version bump . Do not install licenses or documentation directory (bug #315473). Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 14558fabe18a..3971881d3ee7 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-client/opera # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.464 2010/04/16 13:38:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.465 2010/04/20 15:38:07 jer Exp $ + +*opera-10.52_pre6320 (20 Apr 2010) + + 20 Apr 2010; Jeroen Roovers -opera-10.52_pre6302.ebuild, + -opera-10.52_pre6306.ebuild, +opera-10.52_pre6320.ebuild: + Version bump + . Do not + install licenses or documentation directory (bug #315473). *opera-10.52_pre6317 (16 Apr 2010) diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index bc50b9d8e13e..ee74b53cecf3 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -9,14 +9,6 @@ DIST opera-10.10.gcc4-bundled-qt4.i386.tar.bz2 16529068 RMD160 b10ddc7f727352e7c DIST opera-10.10.gcc4-bundled-qt4.x86_64.tar.bz2 17297117 RMD160 2a3be809b1463858e444e19c32b596081dec0dd9 SHA1 9f744474dac1da9fc08ce16857f1b867620daf6e SHA256 25b9b119da04068d0b99a93446cdb5496ece81a4e2d387f9bc9ca274178713da DIST opera-10.10.gcc4-qt4.i386.tar.bz2 11691076 RMD160 c567e56211e096bfed792e52f016a9e12ea94115 SHA1 f6d2938acdc8bbe2d762521313892989fd62a8be SHA256 c35992860387a88303bfdc4b7fe354914a720e7fdebfd37025dbebe721e6467a DIST opera-10.10.gcc4-qt4.x86_64.tar.bz2 12537317 RMD160 db34e4a2b92965472ecc47cab7be9209c97c488b SHA1 6098ac4e4b2fd0519bdbfdb32dc97e50d17fd004 SHA256 63d7678414f3ac40917fda71d745d81d048dadd723da56300fd424542a012df8 -DIST opera-10.52-6302.i386.freebsd.tar.bz2 13109419 RMD160 ac3dcf7dc13ce7094b6664da1e6e8ff505317084 SHA1 b6a3ee6b99555e1076c78c3f25d5afa48968f2b9 SHA256 2a83f3070401b8c6dde508bf83306a8f8478eaf51e3992fde304064dfec588eb -DIST opera-10.52-6302.i386.linux.tar.bz2 13019072 RMD160 d2c038e18d7c30258e5d0eb7f75acb0e0371245d SHA1 f09e87a9fcdf41d8d7d081d2c1c8f8c6eb69ddf2 SHA256 bfe9158cbe8b7e4340c5cde58dd6cba6d029303f6132ce415412d4575a052d34 -DIST opera-10.52-6302.ppc.linux.tar.bz2 13343811 RMD160 5714f60a5d241a1bbad41bd9af2c96af27b7299f SHA1 85d0367df5670cf60f3f3fb439c2504487297022 SHA256 a31199391866ffef0d976fda667064b69bd83f1e5bdee6a80b897660e0efe0ed -DIST opera-10.52-6302.x86_64.linux.tar.bz2 13995215 RMD160 9bf1faa809c1e9c9c3ba776579c6cd2518c0e2ae SHA1 bd96ce21055ea714d0d88b7ca6b632714fbf6fb6 SHA256 7d134cf1f37d4415247376de0d07e50935417460f7e26fcf5b5bda0dd7e171a7 -DIST opera-10.52-6306.i386.freebsd.tar.bz2 13111049 RMD160 e6d53cd2d04139b348bb0fff47ed125943e42995 SHA1 6a97f88afe587051205bfdfad0b04a049e2ccec9 SHA256 9e213acf89b7fbb9e9812abd0a16630d4ba63c12ab102800b6c2a73301de5ee8 -DIST opera-10.52-6306.i386.linux.tar.bz2 13022835 RMD160 fd7abfb904585fe3385c65553b1b5806ddc13f89 SHA1 21686c9e3a434907153e083e6d816bc00d9cc4df SHA256 668cd793a797856ed00aba8f49ddcba7e87f5bec40e626c761edc88b07e6d54a -DIST opera-10.52-6306.ppc.linux.tar.bz2 13348826 RMD160 456bcdec0bbd833ceef8831341f639669281473b SHA1 481d42a1032871302f9214f2d8fdf5273b059bf2 SHA256 76c583e854e0f310c19d6228534e676e0fe801f54b9dd3e5e29e6b32e9b7f2ca -DIST opera-10.52-6306.x86_64.linux.tar.bz2 13993293 RMD160 ff7f2da577758870c6ef8102be1910dfa51a27be SHA1 50e675ec8f141d44bf5d272074c94fc530ad7550 SHA256 817f5e844cf8b034c305bd8f90ce7647d21766682949e42e889235b278aa7085 DIST opera-10.52-6312.i386.freebsd.tar.bz2 13217324 RMD160 f4b4eb70c73f277fe5ef9872bb2ca359925fb1e9 SHA1 7da570fe53c2411c14512bf4e934f500c288bdfe SHA256 6e160784e98f0765cdbf9c0fe983b82447eb9c51ace7c022d3c28c01a8c76052 DIST opera-10.52-6312.i386.linux.tar.bz2 13137379 RMD160 544fdb0ef8faf70999d3bece5b745dd54f0eb0db SHA1 359d4e5d14f8b01dded64f6c3c9a03aec341516d SHA256 0ecadb83f975518ff6fe116567835d9454f1c9dd9a7f7434164db2722ca5c147 DIST opera-10.52-6312.ppc.linux.tar.bz2 13438602 RMD160 5b93e05cc6b368443c3a0e28970c34ec1c20d9b6 SHA1 3344e9400c34917ee00654ec2cabe055bb82f2ac SHA256 7b440c2e13117361169fe2f55794ac2062362263b092cf645f1f3e979b89326f @@ -25,11 +17,14 @@ DIST opera-10.52-6317.i386.freebsd.tar.bz2 13218979 RMD160 fe36ad60153714a2a1ab6 DIST opera-10.52-6317.i386.linux.tar.bz2 13137545 RMD160 f59acf6f343bed29888997accd6760b3cadd7a11 SHA1 28a026a8bafba6844c2dd53e5eee426a63a2312c SHA256 66ce340207614c1cba2ca9c65f50edf1bdf187313abed4c317ddb245d355db43 DIST opera-10.52-6317.ppc.linux.tar.bz2 13443038 RMD160 5f50c8be57650996173dd5d4da194083cbbe987c SHA1 2a3420e70e802fffc62d92b8c9356952df9b6e10 SHA256 7a80d06a9576e4f6466ba04f3d64a46746d3448329dec4e1ff88c0bb96d17db4 DIST opera-10.52-6317.x86_64.linux.tar.bz2 14163760 RMD160 c94addca318784d01cd6955dbf82c8117168e310 SHA1 5e51299e3acc22a942d5c765b06e098b6483b2b1 SHA256 5728c7695b8789288af8324cc6163c59a85bc435c9f30f814c318a6924453b6a +DIST opera-10.52-6320.i386.freebsd.tar.bz2 13216538 RMD160 76dbb94f3ec9a714513e6874c1364c8398d7034a SHA1 2a0922f2ead9002bb1351c743b6603a6298af896 SHA256 d759655e26b28161840fc8bc1c7929b84d41e3cd19bdcbe00d28ba0c829c82b9 +DIST opera-10.52-6320.i386.linux.tar.bz2 13136417 RMD160 c42b1bfd1e893c6d2b96095023f4000a89698738 SHA1 251aa3297f147e421a0d6f03cdeedeca3bb70db1 SHA256 6c9379707bb755fe6d0b11dec54300378a9c6665592aa8876a1a0e658d569d65 +DIST opera-10.52-6320.ppc.linux.tar.bz2 13436162 RMD160 7015252bbe5c403acbf4d29a712db7d1fea8e032 SHA1 02c7d9766011caae03f4c24bcf821349adcc16a3 SHA256 3150102cb8676a994ddd4c85f4de80ace7c72a537f0f6b4d0aaa510e3b4f7275 +DIST opera-10.52-6320.x86_64.linux.tar.bz2 14163998 RMD160 9e4092e3c1c2500c50547b774a40bdcb46ba60bd SHA1 134835095526c56d2c16236dd79947f34149d989 SHA256 5658145804f4e011ea3d805368723231812b73f406a35f9c20cd8090dba6fe31 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565 -EBUILD opera-10.52_pre6302.ebuild 4381 RMD160 2586f15b806594d860ca538fe3b336e321a96d35 SHA1 93072dc99f3b6254488ebdf0d52d1c883bca7de1 SHA256 a495a7f72c713340bf5cd40749afcd2a65a75f3cce9bfed436a95323840ba9be -EBUILD opera-10.52_pre6306.ebuild 4381 RMD160 7fef7e4d9095fb0d3fb0b9b84c92852227021da2 SHA1 b14a8d0b65d6ca825130a5ae6a8c9760edfdd920 SHA256 0ee0c3f46310604131fb35a63193897b0c74d21f5fc3aea286990a2592b205ee EBUILD opera-10.52_pre6312.ebuild 4381 RMD160 7633f5c09fe8a4fe89156233692fc8ae52dfdad8 SHA1 c56ae14ce170aaf902f8fd25362ec58c96608d08 SHA256 f70b4b68f69b72f2eb1df835db24c08ce3eefc4ce4aaaeb7fd5e673e1468b460 EBUILD opera-10.52_pre6317.ebuild 4381 RMD160 b932f801147fb6d2b210cb1859b0f6fee3d36209 SHA1 62868123e805854535fef4972f0a4d9b358408b6 SHA256 e3017c5f940016740ae56490691c4827587fda09e4c16a588216d21a6e3cc2f8 -MISC ChangeLog 89392 RMD160 1a9bfaf8ee40994c9301478a56a4265c39c146ee SHA1 a6d76ccdad08014bb765b2f05bfdc1b38748c7f4 SHA256 b306b1c48b94e71dee0ee48d36393249e82e49af4258da35e241668d59f36ea1 +EBUILD opera-10.52_pre6320.ebuild 4452 RMD160 e4c2f863318b3671340d20bc7d8b06c17fa41f9e SHA1 8e59b41c1c24e3033d67bf131bf7d6ddd97959b4 SHA256 41c0dcbf4473adac79258b17e3a181fb73f12c2ba0ae8cb862488cdf46a7902d +MISC ChangeLog 89717 RMD160 8d93a007caafbe1f8a3c306c3d320e905df3902e SHA1 c2ed075a41506450d751b1609f07a94028bf7811 SHA256 f303d883a54c6ebc5ac5a227dce71597a57a7c2a5534357fe1e6de53926d4a13 MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a diff --git a/www-client/opera/opera-10.52_pre6306.ebuild b/www-client/opera/opera-10.52_pre6306.ebuild deleted file mode 100644 index d8a24ee2b935..000000000000 --- a/www-client/opera/opera-10.52_pre6306.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.52_pre6306.ebuild,v 1.1 2010/04/08 16:06:09 jer Exp $ - -EAPI="2" - -OPREFIX="/usr/lib" - -inherit eutils - -DESCRIPTION="A standards-compliant graphical Web browser" -HOMEPAGE="http://www.opera.com/" - -SLOT="0" -LICENSE="OPERA-10.50 LGPL-2 LGPL-3" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" - -RESTRICT="mirror test" - -QA_DT_HASH="${OPREFIX}/${PN}/.*" -QA_PRESTRIPPED="${OPREFIX}/${PN}/.*" - -IUSE="elibc_FreeBSD" - -MY_LINGUAS=" - be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka - ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK - zh-TW -" - -for MY_LINGUA in ${MY_LINGUAS}; do - IUSE="${IUSE} linguas_${MY_LINGUA/-/_}" -done - -O_U="http://snapshot.opera.com/unix/snapshot-${PV/*_pre}/" -O_P="${P/_pre/-}" - -SRC_URI=" - amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 ) - ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 ) - x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 ) - x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 ) -" - -DEPEND=">=sys-apps/sed-4" - -RDEPEND=" - =x11-libs/gtk+-2* - dev-libs/atk - dev-libs/expat - dev-libs/glib - media-libs/fontconfig - media-libs/freetype - media-libs/glitz - media-plugins/gst-plugins-meta - media-libs/libpng - sys-apps/util-linux - sys-libs/zlib - virtual/opengl - x11-libs/cairo - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libxcb - x11-libs/pango - x11-libs/pixman - x11-libs/xcb-util - " - -opera_linguas() { - # Remove unwanted LINGUAS: - local LINGUA - local LNGDIR="${D}usr/share/${PN}/locale" - einfo "Keeping these locales: ${LINGUAS}." - for LINGUA in ${MY_LINGUAS}; do - if ! use linguas_${LINGUA/-/_}; then - LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) - rm -r "${LINGUA}" - fi - done -} - -pkg_setup() { - echo -e \ - " ${GOOD}****************************************************${NORMAL}" - elog "If you seek support, please file a bug report at" - elog "https://bugs.gentoo.org and post the output of" - elog " \`emerge --info =${CATEGORY}/${P}'" - echo -e \ - " ${GOOD}****************************************************${NORMAL}" -} - -src_unpack() { - unpack ${A} - if [[ ! -d ${S} ]]; then - cd "${WORKDIR}"/${PN}* || die "failed to enter work directory" - S="$(pwd)" - einfo "Setting WORKDIR to ${S}" - fi -} - -src_install() { - # We install into usr instead of opt as Opera does not support the latter - dodir /usr - mv lib/ share/ "${D}"/usr/ || die "mv lib/ share/ failed" - - # Unzip the man pages before sedding - gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed" - - # Replace PREFIX and SUFFIX in various files - sed -i \ - -e "s:@@{PREFIX}:/usr:g" \ - -e "s:@@{SUFFIX}::g" \ - -e "s:@@{_SUFFIX}::g" \ - -e "s:@@{USUFFIX}::g" \ - "${D}"/usr/share/mime/packages/opera-widget.xml \ - "${D}"/usr/share/man/man1/* \ - "${D}"/usr/share/applications/opera-browser.desktop \ - "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed" - - # Install startup script - dobin ${PN}-widget-manager "${FILESDIR}"/opera || die "dobin failed" - - # Stop revdep-rebuild from checking opera binaries - dodir /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera - - # Change libz.so.3 to libz.so.1 for gentoo/freebsd - if use elibc_FreeBSD; then - scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${PN}/ | \ - while read i; do - if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; - then - export SANITY_CHECK_LIBZ_FAILED=1 - break - fi - sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i" - done - [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1" - fi - - [[ -z MY_LINGUAS ]] || opera_linguas -} - -pkg_postinst() { - elog "To change the UI language, choose [Tools] -> [Preferences], open the" - elog "[General] tab, click on [Details...] then [Choose...] and point the" - elog "file chooser at /usr/share/opera/locale/, then enter the" - elog "directory for the language you want and [Open] the .lng file." - - if use elibc_FreeBSD; then - elog - elog "To improve shared memory usage please set:" - elog "$ sysctl kern.ipc.shm_allow_removed=1" - fi -} diff --git a/www-client/opera/opera-10.52_pre6302.ebuild b/www-client/opera/opera-10.52_pre6320.ebuild similarity index 97% rename from www-client/opera/opera-10.52_pre6302.ebuild rename to www-client/opera/opera-10.52_pre6320.ebuild index 4a8376bb76a1..e9b248a09a7b 100644 --- a/www-client/opera/opera-10.52_pre6302.ebuild +++ b/www-client/opera/opera-10.52_pre6320.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/www-client/opera/opera-10.52_pre6302.ebuild,v 1.1 2010/04/01 17:24:24 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.52_pre6320.ebuild,v 1.1 2010/04/20 15:38:07 jer Exp $ EAPI="2" @@ -112,6 +112,9 @@ src_unpack() { } src_install() { + # Remove "license directory" (bug #315473) + rm -rf "share/doc/opera" + # We install into usr instead of opt as Opera does not support the latter dodir /usr mv lib/ share/ "${D}"/usr/ || die "mv lib/ share/ failed"