From ecbbbd2e2c6957b2f6e157d19084866ee94e32bc Mon Sep 17 00:00:00 2001 From: 11mariom <11mariom+wordpress@gmail.com> Date: Sun, 26 Feb 2012 14:57:59 +0100 Subject: [PATCH] piwik 1.7.1 --- www-apps/piwik/Manifest | 2 + www-apps/piwik/piwik-1.7.1.ebuild | 46 ++++ www-client/firefox/Manifest | 2 - www-client/firefox/firefox-10.0_beta6.ebuild | 364 --------------------------- 4 files changed, 48 insertions(+), 366 deletions(-) create mode 100644 www-apps/piwik/piwik-1.7.1.ebuild delete mode 100644 www-client/firefox/firefox-10.0_beta6.ebuild diff --git a/www-apps/piwik/Manifest b/www-apps/piwik/Manifest index 589c3ac..bd8b9a4 100644 --- a/www-apps/piwik/Manifest +++ b/www-apps/piwik/Manifest @@ -1,3 +1,5 @@ AUX installdoc.txt 710 RMD160 a7e823075754f41b67ef0b1191ff5a8175a2f0a0 SHA1 4ea70e5fc82afba1831eb314fd49be5854ed0d80 SHA256 3f2845e7ffc353d3530943ccbb873249e4e1b8d0e8d4d8caf828477cd04108df +DIST piwik-1.7.1.tar.gz 4609362 RMD160 484d321d31c6e492498b61b3dc05ec3d0d275de6 SHA1 11c5b8de689f7133bacad31c506ab115311a42f2 SHA256 5c921116b9f1e90105952e6cd9254f37cb42a100675917705e4f611dc0d6d555 DIST piwik-1.7.tar.gz 4598025 RMD160 9a2294e620d8ae71c382a2e8e8bcc3db1800557e SHA1 c0205f7d018d8dc33c01e511da3b743a8a0e414c SHA256 221e04df4d26bf0881b06242ba179d7ce01b91bbc5f75b2b48d87388e9dfcb93 +EBUILD piwik-1.7.1.ebuild 1125 RMD160 a2f5fe4d08f78c888bec14f8ff1dc743e4e9490c SHA1 cf37a4a1c2541b55106cf725c764bc7f9e57a3db SHA256 99065bcdbf9d64747b760224a1c53eda72dd8a6c490994a5c7ed0ae7f4455e3b EBUILD piwik-1.7.ebuild 1125 RMD160 a2f5fe4d08f78c888bec14f8ff1dc743e4e9490c SHA1 cf37a4a1c2541b55106cf725c764bc7f9e57a3db SHA256 99065bcdbf9d64747b760224a1c53eda72dd8a6c490994a5c7ed0ae7f4455e3b diff --git a/www-apps/piwik/piwik-1.7.1.ebuild b/www-apps/piwik/piwik-1.7.1.ebuild new file mode 100644 index 0000000..7e2a426 --- /dev/null +++ b/www-apps/piwik/piwik-1.7.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: + +EAPI=2 + +inherit webapp depend.php + +DESCRIPTION="Piwik is a downloadable, open source (GPL licensed) real time web analytics software program." +HOMEPAGE="http://www.piwik.org/" +SRC_URI="http://builds.piwik.org/piwik-${PV}.tar.gz" +RESTRICT="mirror" + +LICENSE="GPL-3" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="dev-lang/php[pdo,ctype,xml] || ( =dev-lang/php-5.3 )" + +need_httpd_cgi +need_php_httpd + +pkg_setup() { + webapp_pkg_setup +} + +src_install() { + webapp_src_preinst + + insinto "${MY_HTDOCSDIR}" + dodir "${MY_HTDOCSDIR}/"{tmp,config} + doins -r piwik/* + + webapp_serverowned -R "${MY_HTDOCSDIR}/"{tmp,config} + webapp_postinst_txt en "${FILESDIR}"/installdoc.txt + webapp_configfile "${MY_HTDOCSDIR}/config/"{global.ini.php,manifest.inc.php} + webapp_src_install + fperms -R 0660 "${MY_HTDOCSDIR}/"{tmp,config} +} + +pkg_postinst() { + elog "Install and upgrade instructions can be found here:" + elog " http://piwik.org/docs/installation-optimization/" + webapp_pkg_postinst +} diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 2f5c37a..a49aa84 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -9,8 +9,6 @@ AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05 DIST firefox-10.0b2.source.tar.bz2 75487052 RMD160 ff13d384e14855ae3c7958508056eacfb159009c SHA1 54e1c22ed7c794cc923379810ef882227162a703 SHA256 d4571d9491bbd09f08ae2863b1b0b748680dae6880ac52d01840241ce634c9e2 DIST firefox-10.0b4.source.tar.bz2 75442104 RMD160 74e195ec3a8aa655d7c2940a73b4adce27873008 SHA1 a51eec8246b0ca4f73f724eb4657ca03482abcdf SHA256 a46f007702bcd07e823aa1a015f21cba430fe0d3acdcdae40dfe413bab52d40c -DIST firefox-10.0b6.source.tar.bz2 75442266 RMD160 c841efc74a23f6c3317bf75bbc22940a1adf8d9c SHA1 90d207968ac4224d22406ce59b823612638d9791 SHA256 3fc5d2d598acbfec7eab1411bdd9b1442514b33e0b32f66c1e58370c99496693 DIST firefox-9.0-patches-0.4.tar.xz 18268 RMD160 09d38519a63ebcc0befdcf2d89cee465e1f530a9 SHA1 c58d932c85c6518302b7b51ebb22b361b3c971f7 SHA256 608b94350368649991ce7c4f45cd61272b680aa71bb185aa35f7197bb6a8de49 EBUILD firefox-10.0_beta2.ebuild 11751 RMD160 61bc1ea983e8912a21e42cd894cdb41f377aeebb SHA1 356267d924a83cea7869a675e123bb29bdbf7b07 SHA256 c71c684e5d1055c35431b312c061224518e697737a2f677b4a9511bba765328a EBUILD firefox-10.0_beta4.ebuild 11751 RMD160 61bc1ea983e8912a21e42cd894cdb41f377aeebb SHA1 356267d924a83cea7869a675e123bb29bdbf7b07 SHA256 c71c684e5d1055c35431b312c061224518e697737a2f677b4a9511bba765328a -EBUILD firefox-10.0_beta6.ebuild 11751 RMD160 61bc1ea983e8912a21e42cd894cdb41f377aeebb SHA1 356267d924a83cea7869a675e123bb29bdbf7b07 SHA256 c71c684e5d1055c35431b312c061224518e697737a2f677b4a9511bba765328a diff --git a/www-client/firefox/firefox-10.0_beta6.ebuild b/www-client/firefox/firefox-10.0_beta6.ebuild deleted file mode 100644 index 3bb0520..0000000 --- a/www-client/firefox/firefox-10.0_beta6.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -VIRTUALX_REQUIRED="pgo" -WANT_AUTOCONF="2.1" - -inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins - -MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc. -FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI -FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI -FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI -CHANGESET="e56ecd8b3a68" -PATCH="${PN}-9.0-patches-0.4" - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="http://www.mozilla.com/firefox" - -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="bindist +crashreporter +ipc pgo system-sqlite +webm" - -FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/" -# More URIs appended below... -SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz" - -ASM_DEPEND=">=dev-lang/yasm-1.1" - -# Mesa 7.10 needed for WebGL + bugfixes -RDEPEND=" - >=sys-devel/binutils-2.16.1 - >=dev-libs/nss-3.13.1 - >=dev-libs/nspr-4.8.8 - >=dev-libs/glib-2.26:2 - >=media-libs/mesa-7.10 - media-libs/libpng[apng] - virtual/libffi - system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) - webm? ( >=media-libs/libvpx-0.9.7 - media-libs/alsa-lib ) - crashreporter? ( net-misc/curl )" -# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason -DEPEND="${RDEPEND} - dev-util/pkgconfig - pgo? ( - =dev-lang/python-2*[sqlite] - >=sys-devel/gcc-4.5 ) - webm? ( x86? ( ${ASM_DEPEND} ) - amd64? ( ${ASM_DEPEND} ) )" - -# No source releases for alpha|beta -if [[ ${PV} =~ alpha ]]; then - SRC_URI="${SRC_URI} - http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2" - S="${WORKDIR}/mozilla-central" -elif [[ ${PV} =~ beta ]]; then - SRC_URI="${SRC_URI} - ${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2" - S="${WORKDIR}/mozilla-beta" -else - SRC_URI="${SRC_URI} - ${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2" - S="${WORKDIR}/mozilla-release" -fi - -# No language packs for alphas -if ! [[ ${PV} =~ alpha|beta ]]; then - # This list can be updated with scripts/get_langs.sh from mozilla overlay - LANGS=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en en-GB en-US - en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he - hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl - nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK - te th tr uk vi zh-CN zh-TW zu) - - for X in "${LANGS[@]}" ; do - # en and en_US are handled internally - if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then - SRC_URI="${SRC_URI} - linguas_${X/-/_}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X/-/_}" - # Install all the specific locale xpis if there's no generic locale xpi - # Example: there's no pt.xpi, so install all pt-*.xpi - if ! has ${X%%-*} "${LANGS[@]}"; then - SRC_URI="${SRC_URI} - linguas_${X%%-*}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - IUSE="${IUSE} linguas_${X%%-*}" - fi - done -fi - -QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" - -# TODO: Move all the linguas crap to an eclass -linguas() { - # Generate the list of language packs called "linguas" - # This list is used to install the xpi language packs - local LINGUA - for LINGUA in ${LINGUAS}; do - if has ${LINGUA} en en_US; then - # For mozilla products, en and en_US are handled internally - continue - # If this language is supported by ${P}, - elif has ${LINGUA} "${LANGS[@]//-/_}"; then - # Add the language to linguas, if it isn't already there - has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-}) - continue - # For each short LINGUA that isn't in LANGS, - # add *all* long LANGS to the linguas list - elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then - for LANG in "${LANGS[@]}"; do - if [[ ${LANG} == ${LINGUA}-* ]]; then - has ${LANG} "${linguas[@]}" || linguas+=(${LANG}) - continue 2 - fi - done - fi - ewarn "Sorry, but ${P} does not support the ${LINGUA} locale" - done -} - -pkg_setup() { - moz_pkgsetup - - # Avoid PGO profiling problems due to enviroment leakage - # These should *always* be cleaned up anyway - unset DBUS_SESSION_BUS_ADDRESS \ - DISPLAY \ - ORBIT_SOCKETDIR \ - SESSION_MANAGER \ - XDG_SESSION_COOKIE \ - XAUTHORITY - - if ! use bindist; then - einfo - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation" - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi - - if use pgo; then - einfo - ewarn "You will do a double build for profile guided optimization." - ewarn "This will result in your build taking at least twice as long as before." - fi - - # Ensure we have enough disk space to compile - if use pgo ; then - CHECKREQS_DISK_BUILD="8G" - check-reqs_pkg_setup - else - CHECKREQS_DISK_BUILD="4G" - check-reqs_pkg_setup - fi -} - -src_unpack() { - unpack ${A} - - linguas - for X in "${linguas[@]}"; do - # FIXME: Add support for unpacking xpis to portage - xpi_unpack "${P}-${X}.xpi" - done -} - -src_prepare() { - # Apply our patches - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_EXCLUDE="5009_revert_bug_708572.patch 2001-gentoo_no_app_updates.patch 2003_fix_system_hunspell_dict_detection.patch 5002_allow_locked_prefs.patch 5004_properly_launch_applications_set_in_home.patch 5007_fix_libpr0n_nsPNGDecoder.patch 5008_revert_bug_468730.patch 6000_add_mips_hppa_ia64_s390_and_sparc_defines_in_ipc.patch 6002_use_a_pool_size_of_16kB_on_ia64.patch 6003_revert_bug_164580.patch 6004_ldrh_strh_ldrsb_strsb_arc_supported_on_armv5.patch 6005_reimplement_NS_InvokeByIndex_in_C_on_S390.patch 6010_avoid_invalid_conversions.patch" \ - epatch "${WORKDIR}/firefox" - - # Allow user to apply any additional patches without modifing ebuild - epatch_user - - # Enable gnomebreakpad - if use debug ; then - sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ - "${S}"/build/unix/run-mozilla.sh || die "sed failed!" - fi - - # Disable gnomevfs extension - sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \ - -e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \ - || die "Failed to remove gnomevfs extension" - - # Ensure that are plugins dir is enabled as default - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!" - - # Fix sandbox violations during make clean, bug 372817 - sed -e "s:\(/no-such-file\):${T}\1:g" \ - -i "${S}"/config/rules.mk \ - -i "${S}"/js/src/config/rules.mk \ - -i "${S}"/nsprpub/configure{.in,} \ - || die - - #Fix compilation with curl-7.21.7 bug 376027 - sed -e '/#include /d' \ - -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \ - -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \ - -i "${S}"/config/system-headers \ - -i "${S}"/js/src/config/system-headers || die "Sed failed" - - eautoreconf -} - -src_configure() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - MEXTENSIONS="default" - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - mozconfig_annotate '' --prefix="${EPREFIX}"/usr - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - mozconfig_annotate '' --disable-gconf - mozconfig_annotate '' --disable-mailnews - mozconfig_annotate '' --enable-canvas - mozconfig_annotate '' --enable-safe-browsing - mozconfig_annotate '' --with-system-png - mozconfig_annotate '' --enable-system-ffi - - # Other ff-specific settings - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" - - mozconfig_use_enable system-sqlite - - # Allow for a proper pgo build - if use pgo; then - echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig - fi - - # Finalize and report settings - mozconfig_final - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then - if use amd64 || use x86; then - append-flags -mno-avx - fi - fi -} - -src_compile() { - if use pgo; then - addpredict /root - addpredict /etc/gconf - # Firefox tries to dri stuff when it's run, see bug 380283 - shopt -s nullglob - local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g') - shopt -u nullglob - test -n "${cards}" && addpredict "${cards}" - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ - Xemake -f client.mk profiledbuild || die "Xemake failed" - else - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ - emake -f client.mk || die "emake failed" - fi - -} - -src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - # MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc. - local obj_dir="$(echo */config.log)" - obj_dir="${obj_dir%/*}" - cd "${S}/${obj_dir}" - - # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell - - # Add our default prefs for firefox + xulrunner - cp "${FILESDIR}"/gentoo-default-prefs.js-1 \ - "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die - - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ - emake DESTDIR="${D}" install || die "emake install failed" - - linguas - for X in "${linguas[@]}"; do - xpi_install "${WORKDIR}/${P}-${X}" - done - - local size sizes icon_path icon name - if use bindist; then - sizes="16 32 48" - icon_path="${S}/browser/branding/unofficial" - # Firefox's new rapid release cycle means no more codenames - # Let's just stick with this one... - icon="tumucumaque" - name="Tumucumaque" - else - sizes="16 22 24 32 256" - icon_path="${S}/browser/branding/official" - icon="${PN}" - name="Mozilla Firefox" - fi - - # Install icons and .desktop for menu entry - for size in ${sizes}; do - insinto "/usr/share/icons/hicolor/${size}x${size}/apps" - newins "${icon_path}/default${size}.png" "${icon}.png" || die - done - # The 128x128 icon has a different name - insinto "/usr/share/icons/hicolor/128x128/apps" - newins "${icon_path}/mozicon128.png" "${icon}.png" || die - # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs - newicon "${icon_path}/content/icon48.png" "${icon}.png" || die - newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die - sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ - "${ED}/usr/share/applications/${PN}.desktop" || die - - # Add StartupNotify=true bug 237317 - if use startup-notification ; then - echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop" - fi - - # Required in order to use plugins and even run firefox on hardened. - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container} - - # Plugins dir - share_plugins_dir - - # very ugly hack to make firefox not sigbus on sparc - # FIXME: is this still needed?? - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ - -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \ - die "sparc sed failed"; } -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- 2.11.4.GIT