From 4917da32849526b8cf28bd2a448db03ef6a02578 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 28 Mar 2010 17:17:57 +0000 Subject: [PATCH] Replace @@[*SUFFIX|PREFIX] in various text files thanks to Andrian Nord (bug #311449). Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- www-client/opera/ChangeLog | 9 +- www-client/opera/Manifest | 9 +- www-client/opera/opera-10.20_pre4744.ebuild | 179 ------------------ ...2.ebuild => opera-10.52_pre6272-r1.ebuild} | 22 ++- 4 files changed, 27 insertions(+), 192 deletions(-) delete mode 100644 www-client/opera/opera-10.20_pre4744.ebuild rename www-client/opera/{opera-10.52_pre6272.ebuild => opera-10.52_pre6272-r1.ebuild} (84%) diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index f298141ce8d1..fd9cbdfd78e8 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,13 @@ # 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.458 2010/03/27 13:20:12 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.459 2010/03/28 17:17:57 jer Exp $ + +*opera-10.52_pre6272-r1 (28 Mar 2010) + + 28 Mar 2010; Jeroen Roovers -opera-10.20_pre4744.ebuild, + -opera-10.52_pre6272.ebuild, +opera-10.52_pre6272-r1.ebuild: + Replace @@[*SUFFIX|PREFIX] in various text files thanks to Andrian Nord + (bug #311449). *opera-10.52_pre6272 (27 Mar 2010) diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 2bdab146473a..34f64a08ec88 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -9,10 +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.20-4744.gcc4-bundled-qt4.i386.tar.bz2 16706241 RMD160 75a1e23d18e4ebf779fc4ad145d90d68c9a2c767 SHA1 d2a6326d3abb50f798e4ee305936d8a3d2c9b95e SHA256 0da70cf47b9161a3a114638760982eaca8d355935bf4f1db4c5b8f0109c860b6 -DIST opera-10.20-4744.gcc4-bundled-qt4.x86_64.tar.bz2 17487833 RMD160 68a6b54f2adb00ea39ddf3fce9d6f645a306e3e4 SHA1 8db87855b5ff70248997c4b03d3e4ceedeee9f64 SHA256 fa6de10d1920135cac53eaff6ab58a5b2096476b5f557bf3b7f36716bec72f98 -DIST opera-10.20-4744.gcc4-qt4.i386.tar.bz2 11884785 RMD160 aa05575b484206d9be554625d8b57c663c457b19 SHA1 9044d368b31be4273a29ea1ef1dbe674e05b7e75 SHA256 481a720c7ff0fecae8e80f16649d13347edb629015aed8e702810192d75fe25f -DIST opera-10.20-4744.gcc4-qt4.x86_64.tar.bz2 12734457 RMD160 3d17082f9d0f27e75514ba3f38d1ae176e3d12d5 SHA1 9ee55a4eac4ffdfb86c0e8eaf4abbb1d6cc918ef SHA256 9933080087966a358c6dbff579957fc966dcbeb2eeb090bc9fc595e07908d20a DIST opera-10.51-6252.i386.freebsd.tar.bz2 13077712 RMD160 ad806794fa1e3e121825b2fcd9fcdbdd9fbba659 SHA1 bec204bf8ff543282b8e7a61ce3c77ce6760779d SHA256 c2dc6a2c77b736845562c75898475010e96466aebf1f6f7aafac2ea3f1de0619 DIST opera-10.51-6252.i386.linux.tar.bz2 13013072 RMD160 98fc07e9f40c4cd2e9cd57726d3d7a4b0bb617c6 SHA1 4088704b41baf93fb919b364325c42931b229900 SHA256 6d9002fb7ee622e4c51d527c7efbb1866449a3e86c5bc2c146fb95763a415f7a DIST opera-10.51-6252.ppc.linux.tar.bz2 13348226 RMD160 5bf63f798df5d9fa0018cad993ef9592af7c0488 SHA1 bfc48c9f58ef83d9d65a8fe0a84913cbc6db69a3 SHA256 89ec203599278caf37dff82927a42f96be22c17a14512ef5c41196593cbe6f75 @@ -23,8 +19,7 @@ DIST opera-10.52-6272.ppc.linux.tar.bz2 13347169 RMD160 3667a9fe8c1057a9d901d739 DIST opera-10.52-6272.x86_64.linux.tar.bz2 13996315 RMD160 101ed56b37b9a09ac2b357b9e645d8db8ec7b8c2 SHA1 99aea83edf89e69bcda3a54c8e7b449e1455d876 SHA256 8f410cc7391053d79cbf335f8e964b75d65a5d11d942c462626a5ed4028fe4e9 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.20_pre4744.ebuild 5082 RMD160 3345df94e66946bde58d0f52aaae9c22346b87bf SHA1 d7a61c4f9c74fa64a2d0ea4e80307f62daf706a6 SHA256 86a87fd4fe4a30a1abd2a60031ef8632fe1e7d6afebeb0c27d4d3b5d244a89de EBUILD opera-10.51_pre6252.ebuild 3909 RMD160 4a4fecd18cb330222a49fa2cd202c1104e416dbc SHA1 a1f5a187de4d030e2229546c10e0e7cdc6fc6210 SHA256 f1fb899d7ec2ecdfd2c1d5891aa64d13ffbf4e4811e34dd88c8aeeed88fea2c3 -EBUILD opera-10.52_pre6272.ebuild 3913 RMD160 a55cadd2e8acf6aab35f87c24a8b80b43bb48514 SHA1 83f09234917c4a779c5864167a96ebdf5258789a SHA256 c2885934528795732c5718d265faae60a0b6d4c95c3a24335c73ebe0a186b60f -MISC ChangeLog 88019 RMD160 617f3522eb33f49be2fccfb562c60e324d335d45 SHA1 27bdd72c9b90ae9a9a3e71a524c2dad2c4d6e565 SHA256 6055d5604f3426b90ad8c3a32922a8b53f66a178a65da671b63f6ed6aad9868e +EBUILD opera-10.52_pre6272-r1.ebuild 4384 RMD160 aa1534714e349b71fd48645ba057b22d00a5fe7c SHA1 252f68c00533dbd5131b424ce8cc122849dffa5a SHA256 b5415bb74f6e1fc6c2a0664b198d79e429357eb9da258b5268a7742e2406570e +MISC ChangeLog 88289 RMD160 2e6ff91f256a3f6579338976b7a2576a2e222072 SHA1 69d8e7165517a5c4a9677fcba9453352df330acf SHA256 cf98fd18142ba3aca81eed3c73b4ee50a86effbcad44431f88ff8979e13ae422 MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a diff --git a/www-client/opera/opera-10.20_pre4744.ebuild b/www-client/opera/opera-10.20_pre4744.ebuild deleted file mode 100644 index ddef457880e5..000000000000 --- a/www-client/opera/opera-10.20_pre4744.ebuild +++ /dev/null @@ -1,179 +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.20_pre4744.ebuild,v 1.8 2010/02/17 06:18:18 jer Exp $ - -EAPI="2" - -GCONF_DEBUG="no" - -inherit eutils gnome2 - -DESCRIPTION="A standards-compliant graphical Web browser" -HOMEPAGE="http://www.opera.com/" - -SLOT="0" -LICENSE="OPERA-10.10" -KEYWORDS="~amd64 ~x86" - -RESTRICT="mirror test" - -QA_DT_HASH="opt/${PN}/.*" -QA_PRESTRIPPED=" - opt/${PN}/lib/${PN}/${PV/_pre*}/missingsyms.so - opt/${PN}/lib/${PN}/${PV/_pre*}/spellcheck.so - opt/${PN}/lib/${PN}/${PV/_pre*}/opera - opt/${PN}/lib/${PN}/${PV/_pre*}/works - opt/${PN}/lib/${PN}/${PV/_pre*}/operaplugincleaner - opt/${PN}/lib/${PN}/${PV/_pre*}/operapluginwrapper -" -QA_PRESTRIPPED_amd64=" - ${QA_PRESTRIPPED} - opt/${PN}/lib/${PN}/${PV/_pre*}/operapluginwrapper-ia32-linux - opt/${PN}/lib/${PN}/${PV/_pre*}/operapluginwrapper-native -" - -IUSE="gnome qt-static" -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 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-4744/" -O_P="${P/_pre/-}" - -SRC_URI=" - amd64? ( - qt-static? ( ${O_U}x86_64-linux/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 ) - !qt-static? ( ${O_U}x86_64-linux/${O_P}.gcc4-qt4.x86_64.tar.bz2 ) - ) - x86? ( - qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 ) - !qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 ) - ) - " - -DEPEND=">=sys-apps/sed-4" - -RDEPEND=" - media-libs/jpeg - media-libs/libexif - >=media-libs/fontconfig-2.1.94-r1 - x11-libs/libXrandr - x11-libs/libXp - x11-libs/libXmu - x11-libs/libXi - x11-libs/libXft - x11-libs/libXext - x11-libs/libXcursor - x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE - amd64? ( - qt-static? ( media-libs/nas ) - !qt-static? ( x11-libs/qt-gui ) - ) - x86? ( - qt-static? ( media-libs/nas ) - !qt-static? ( x11-libs/qt-gui ) - ) - " - -opera_linguas() { - # Remove unwanted LINGUAS: - local LINGUA - local LNGDIR="${D}/opt/opera/share/opera/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_prepare() { - epatch "${FILESDIR}/${PN}-gentoo.patch" - epatch "${FILESDIR}/${PN}-simplify-desktop.patch" - epatch "${FILESDIR}/${PN}-freedesktop.patch" - - # bug #181300: - epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch" - - sed -e "s|config_dir=\"/etc\"|config_dir=\"${D}/etc/\"|g" \ - -e "s|\(str_localdirplugin=\).*$|\1/opt/opera/lib/opera/plugins|" \ - -e 's|#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\)|\1|' \ - -e 's|#\(OPERA_FORCE_JAVA_ENABLED=\)|\1|' \ - -e '/md5check Manifest.md5/d' \ - -i install.sh || die "sed failed" -} - -# These workarounds are sadly needed because gnome2.eclass doesn't check -# whether a configure/Makefile script exists. -src_configure() { :; } -src_compile() { :; } - -src_install() { - # Prepare installation directories for Opera's installer script. - dodir /etc - - # Opera's native installer. - ./install.sh --prefix="${D}"/opt/opera || die "install.sh failed" - - einfo "It is safe to ignore warnings about files that would be ignored." - einfo "Completing the installation where install.sh abandoned us ..." - - # java workaround - sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' "${D}"/opt/opera/bin/opera - - dosed /opt/opera/bin/opera - dosed /opt/opera/share/opera/java/opera.policy - - # Adapt desktop file to Gnome when needed - use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop - - # Install a symlink /usr/bin/opera - dodir /usr/bin - dosym /opt/opera/bin/opera /usr/bin/opera - - dodir /etc/revdep-rebuild - echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera - - # Add the Opera man dir to MANPATH: - insinto /etc/env.d - echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera - - [[ -z MY_LINGUAS ]] || opera_linguas -} - -pkg_postinst() { - use gnome && gnome2_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 /opt/opera/share/opera/locale/, then enter the" - elog "directory for the language you want and [Open] the .lng file." -} - -pkg_postrm() { - use gnome && gnome2_pkg_postrm -} diff --git a/www-client/opera/opera-10.52_pre6272.ebuild b/www-client/opera/opera-10.52_pre6272-r1.ebuild similarity index 84% rename from www-client/opera/opera-10.52_pre6272.ebuild rename to www-client/opera/opera-10.52_pre6272-r1.ebuild index 60a42ec2049b..4688c03236bc 100644 --- a/www-client/opera/opera-10.52_pre6272.ebuild +++ b/www-client/opera/opera-10.52_pre6272-r1.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_pre6272.ebuild,v 1.1 2010/03/27 13:20:12 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.52_pre6272-r1.ebuild,v 1.1 2010/03/28 17:17:57 jer Exp $ EAPI="2" @@ -112,11 +112,23 @@ src_unpack() { } src_install() { - # This alpha build hardcodes /usr as prefix + # We install into usr instead of opt as Opera does not support the latter dodir /usr - mv lib/ share/ "${D}"/usr/ || die "mv etc/ usr/ failed" - - make_desktop_entry ${PN} Opera ${PN} # TODO + 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" -- 2.26.2