From bac31c2f0fcd06a31ef453ac7522e0fa22911d5f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 20 Oct 2015 15:54:08 +0300 Subject: [PATCH] Sync with portage [Tue Oct 20 15:54:01 MSK 2015]. --- dev-java/json/Manifest | 1 + dev-java/json/json-20150729.ebuild | 33 +++ dev-java/json/metadata.xml | 17 ++ media-video/mkvtoolnix/Manifest | 1 + .../mkvtoolnix/mkvtoolnix-8.5.0.ebuild | 116 +++++++++ metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/dev-java/json-20150729 | 13 + .../md5-cache/media-video/mkvtoolnix-8.5.0 | 13 + metadata/md5-cache/sys-cluster/ceph-0.94.3-r1 | 2 +- .../www-plugins/adobe-flash-11.2.202.535 | 15 -- .../www-plugins/adobe-flash-11.2.202.540 | 4 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- sys-cluster/ceph/ceph-0.94.3-r1.ebuild | 2 +- sys-cluster/ceph/metadata.xml | 2 + www-plugins/adobe-flash/Manifest | 3 - .../adobe-flash-11.2.202.535.ebuild | 234 ------------------ .../adobe-flash-11.2.202.540.ebuild | 2 +- 21 files changed, 207 insertions(+), 263 deletions(-) create mode 100644 dev-java/json/Manifest create mode 100644 dev-java/json/json-20150729.ebuild create mode 100644 dev-java/json/metadata.xml create mode 100644 media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild create mode 100644 metadata/md5-cache/dev-java/json-20150729 create mode 100644 metadata/md5-cache/media-video/mkvtoolnix-8.5.0 delete mode 100644 metadata/md5-cache/www-plugins/adobe-flash-11.2.202.535 delete mode 100644 www-plugins/adobe-flash/adobe-flash-11.2.202.535.ebuild diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest new file mode 100644 index 000000000000..00ca07fa3c04 --- /dev/null +++ b/dev-java/json/Manifest @@ -0,0 +1 @@ +DIST 20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624 diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild new file mode 100644 index 000000000000..6e33966cff63 --- /dev/null +++ b/dev-java/json/json-20150729.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java implementation of the JavaScript Object Notation" +HOMEPAGE="http://www.json.org/java/" +SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +DEPEND=">=virtual/jdk-1.7" +RDEPEND=">=virtual/jre-1.7" + +S="${WORKDIR}/JSON-java-${PV}" +JAVA_SRC_DIR="src" + +java_prepare() { + chmod a-x *.java || die + mkdir -p src || die + mv *.java src || die +} + +src_install() { + java-pkg-simple_src_install + dodoc README || die +} diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml new file mode 100644 index 000000000000..d9dd049b59c2 --- /dev/null +++ b/dev-java/json/metadata.xml @@ -0,0 +1,17 @@ + + + + java + + JSON (JavaScript Object Notation) is a lightweight data-interchange format. + + + douglascrockford/JSON-java + + + chewi@gentoo.org + + + monsieurp@gentoo.org + + diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index b5756928fd57..7d9517990531 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -2,3 +2,4 @@ DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31a DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae DIST mkvtoolnix-8.3.0.tar.xz 5863384 SHA256 87bd82222995d35c310a426ed43e0b27cbfefa0caadcbcca8296787314affc37 SHA512 fb3ac11480c20ae360fef9081991876ef2d7a717f24ec631bb8482ee7d22f79164aafeaf561dee503f1c0a83fe3ed6db319b420c34d638450aada762e6eb00c0 WHIRLPOOL b3cd3f4785c891c75eac3754136aa0b709ff0e784eea6d0e915478eea6fbdbe7132c56a997a007ba6d690649b6caaae46a8b45ae055aab7ae557486d99aab417 DIST mkvtoolnix-8.4.0.tar.xz 3234284 SHA256 f6a5506d14a0b16abb3765d6f78cded0267e01096926b30e8f72df9d30aaf878 SHA512 ab9ab49baf06a8ef713872a09c58fdb1560628dbe3b2b661d809972f56a36c751a390a78ae260624510963b92e177d090088030bb96f9ab9e96e1a372772d22f WHIRLPOOL 811a0466413bdba84959c5ae84d637aba4371018ee3deed70d65f24472c0bf6a714003574efb4e4dcdc3bfb1b3c48595a347ab0bcdd935a9b49e2f1ab4c36c58 +DIST mkvtoolnix-8.5.0.tar.xz 3280556 SHA256 ec3f4566dbc324c3bda7314c70d87046136664d72888945f9fdb8d129e1e05a3 SHA512 18f1bac6ba46d3ec3235d4b8ec8fc9bd0b5993344205172f254d3ca8aa7afdb399d81d9e7d8b24fe004661c83757e82b4874865acaa231e7721b1d8382adfdd3 WHIRLPOOL 453a55adf80fca61be3b102c39ccd48aa057983e8e3d4aea563ffe67ad86ded6889f0e1926e600556d43c4fccacdc79facd6438b8dccb9591a6e86de2919e8b1 diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild new file mode 100644 index 000000000000..9c244eb82a98 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER="3.0" +inherit eutils multilib toolchain-funcs versionator multiprocessing autotools + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix" +SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="curl debug pch test qt5" + +ruby_atom() { + local ruby_slot=${1/ruby/} + ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}" + echo "dev-lang/ruby:${ruby_slot}" +} + +# hacks to avoid using the ruby eclasses since this requires something similar +# to the python-any-r1 eclass for ruby which currently doesn't exist +RUBY_IMPLS=( ruby22 ruby21 ruby20 ) +RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do + echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)" + +RDEPEND=" + >=dev-libs/boost-1.46.0:= + >=dev-libs/libebml-1.3.1:= + dev-libs/pugixml + media-libs/flac + >=media-libs/libmatroska-1.4.2:= + media-libs/libogg + media-libs/libvorbis + sys-apps/file + sys-libs/zlib + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND} + || ( ${RUBY_BDEPS} ) + sys-devel/gettext + virtual/pkgconfig + test? ( dev-cpp/gtest ) +" + +pkg_pretend() { + # https://bugs.gentoo.org/419257 + local ver=4.6 + local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support." + if ! version_is_at_least ${ver} $(gcc-version); then + eerror ${msg} + die ${msg} + fi +} + +src_prepare() { + local ruby_impl + for ruby_impl in "${RUBY_IMPLS[@]}"; do + if has_version "$(ruby_atom ${ruby_impl})"; then + export RUBY=${ruby_impl} + break + fi + done + [[ -z ${RUBY} ]] && die "No available ruby implementations to build with" + + epatch_user + eautoreconf +} + +src_configure() { + local myconf + + if use qt5 ; then + # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 + myconf+=( + --with-moc=/usr/$(get_libdir)/qt5/bin/moc + --with-uic=/usr/$(get_libdir)/qt5/bin/uic + --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc + ) + fi + + econf \ + $(use_enable debug) \ + $(use_enable qt5 qt) \ + $(use_with curl) \ + $(usex pch "" --disable-precompiled-headers) \ + "${myconf[@]}" \ + --disable-optimization \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-boost="${EPREFIX}"/usr \ + --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) +} + +src_compile() { + "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die + "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die + + dodoc AUTHORS ChangeLog README.md + doman doc/man/*.1 +} diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index b1a051789f7e..760f6493debb 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Tue, 20 Oct 2015 08:11:22 +0000 +Tue, 20 Oct 2015 12:11:22 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index b1a051789f7e..840b1e11d35d 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Tue, 20 Oct 2015 08:11:22 +0000 +Tue, 20 Oct 2015 12:11:23 +0000 diff --git a/metadata/md5-cache/dev-java/json-20150729 b/metadata/md5-cache/dev-java/json-20150729 new file mode 100644 index 000000000000..5ac7164a3a2d --- /dev/null +++ b/metadata/md5-cache/dev-java/json-20150729 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install preinst prepare setup +DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) +DESCRIPTION=Java implementation of the JavaScript Object Notation +EAPI=5 +HOMEPAGE=http://www.json.org/java/ +IUSE=test elibc_FreeBSD doc source elibc_FreeBSD +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) +SLOT=0 +SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20150729.zip +_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-pkg-simple 28bfda67a64cc63f4231290d7a22f4dc java-utils-2 c059b30d6a4df7cf32e2c98c1da1c9b5 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=ca84552779df0ab4aa34892df96e2dd3 diff --git a/metadata/md5-cache/media-video/mkvtoolnix-8.5.0 b/metadata/md5-cache/media-video/mkvtoolnix-8.5.0 new file mode 100644 index 000000000000..a6efc327c765 --- /dev/null +++ b/metadata/md5-cache/media-video/mkvtoolnix-8.5.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare pretend test +DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.1:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.2:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ( dev-lang/ruby:2.0 virtual/rubygems[ruby_targets_ruby20] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Tools to create, alter, and inspect Matroska files +EAPI=5 +HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix +IUSE=curl debug pch test qt5 +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.1:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.2:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) +SLOT=0 +SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-8.5.0.tar.xz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 43da5163ba106e87d22d2e7d6d67537f libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=4330e648937756b10ad3b64fa867cb92 diff --git a/metadata/md5-cache/sys-cluster/ceph-0.94.3-r1 b/metadata/md5-cache/sys-cluster/ceph-0.94.3-r1 index e3427e0b70ce..2fa650cdae05 100644 --- a/metadata/md5-cache/sys-cluster/ceph-0.94.3-r1 +++ b/metadata/md5-cache/sys-cluster/ceph-0.94.3-r1 @@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7 ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc SLOT=0 SRC_URI=http://ceph.com/download/ceph-0.94.3.tar.bz2 _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c check-reqs 4f43fb72bc73bd58d75ec601713fae20 eutils 43da5163ba106e87d22d2e7d6d67537f libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 python-single-r1 612c783d1a1a182ad7ea4f2eb0b79e86 python-utils-r1 9c405693f1f355a718700c5cffffd9e5 readme.gentoo e37aea783a61ae55fab947df247eebea systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 udev 37ef89be271b9ae8aa64be024ddb39b5 -_md5_=17542e25133b7329cc9436db2c30c0f2 +_md5_=f545e009c840ff89a34d462bdf7cae40 diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.535 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.535 deleted file mode 100644 index 975ecf24ed72..000000000000 --- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.535 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prerm setup test unpack -DEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) app-arch/unzip -DESCRIPTION=Adobe Flash Player -EAPI=5 -HOMEPAGE=http://www.adobe.com/products/flashplayer.html http://get.adobe.com/flashplayer/ -IUSE=debug kde selinux cpu_flags_x86_sse2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=-* amd64 x86 -LICENSE=AdobeFlash-11.x -RDEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) abi_x86_64? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) abi_x86_32? ( amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/nspr-4.10.4[abi_x86_32(-)] >=dev-libs/nss-3.15.4[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) x86? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) selinux? ( sec-policy/selinux-flash ) -REQUIRED_USE=cpu_flags_x86_sse2 debug? ( abi_x86_32 ) || ( abi_x86_64 abi_x86_32 ) -RESTRICT=strip mirror -SLOT=0 -SRC_URI=abi_x86_32? ( !debug? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.535/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.535.i386.tar.gz ) debug? ( http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz -> adobe-flash-11.2.202.535-debug.i386.tar.gz ) ) abi_x86_64? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.535/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.535.x86_64.tar.gz ) -_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f mozextension 3d8ee4835f89ff39d4666656aa603433 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 nsplugins bf5bfcef1d2f0adad7e6230455df8e91 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=039b11ef3b1b7fed8700a70a9370bfa8 diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.540 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.540 index 856bd95c8996..3dd60ae6548b 100644 --- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.540 +++ b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.540 @@ -4,7 +4,7 @@ DESCRIPTION=Adobe Flash Player EAPI=5 HOMEPAGE=http://www.adobe.com/products/flashplayer.html http://get.adobe.com/flashplayer/ IUSE=debug kde selinux cpu_flags_x86_sse2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=-* ~amd64 ~x86 +KEYWORDS=-* amd64 x86 LICENSE=AdobeFlash-11.x RDEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) abi_x86_64? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) abi_x86_32? ( amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/nspr-4.10.4[abi_x86_32(-)] >=dev-libs/nss-3.15.4[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) x86? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) selinux? ( sec-policy/selinux-flash ) REQUIRED_USE=cpu_flags_x86_sse2 debug? ( abi_x86_32 ) || ( abi_x86_64 abi_x86_32 ) @@ -12,4 +12,4 @@ RESTRICT=strip mirror SLOT=0 SRC_URI=abi_x86_32? ( !debug? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.540/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.540.i386.tar.gz ) debug? ( http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz -> adobe-flash-11.2.202.540-debug.i386.tar.gz ) ) abi_x86_64? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.540/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.540.x86_64.tar.gz ) _eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f mozextension 3d8ee4835f89ff39d4666656aa603433 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 nsplugins bf5bfcef1d2f0adad7e6230455df8e91 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=66fe93cb92c5f6fa335a87e8777bc140 +_md5_=039b11ef3b1b7fed8700a70a9370bfa8 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 30ca8e42532a..840b1e11d35d 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Tue, 20 Oct 2015 08:41:19 +0000 +Tue, 20 Oct 2015 12:11:23 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 1d8650ad18d0..7dc88e495984 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Tue Oct 20 08:11:22 UTC 2015 +Tue Oct 20 12:11:22 UTC 2015 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 16a2ad755273..6abe54eb93dc 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Tue, 20 Oct 2015 08:30:01 +0000 +Tue, 20 Oct 2015 12:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 2366845bba1f..4a8a1373e1a5 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1445328601 Tue 20 Oct 2015 08:10:01 AM UTC +1445343001 Tue 20 Oct 2015 12:10:01 PM UTC diff --git a/sys-cluster/ceph/ceph-0.94.3-r1.ebuild b/sys-cluster/ceph/ceph-0.94.3-r1.ebuild index 36be3f59caac..289517cc30c4 100644 --- a/sys-cluster/ceph/ceph-0.94.3-r1.ebuild +++ b/sys-cluster/ceph/ceph-0.94.3-r1.ebuild @@ -75,7 +75,7 @@ STRIP_MASK="/usr/lib*/rados-classes/*" PATCHES=( "${FILESDIR}"/${PN}-0.79-libzfs.patch ) -CHECKREQS_DISK_BUILD="12G" +CHECKREQS_DISK_BUILD="1G" pkg_setup() { python_setup diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml index f347d5e5d919..3d82223b3644 100644 --- a/sys-cluster/ceph/metadata.xml +++ b/sys-cluster/ceph/metadata.xml @@ -6,6 +6,8 @@ chutzpah@gentoo.org Patrick McLean Co Maintainer + + dlan@gentoo.org Yixun Lan Co Maintainer diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index c8b3afdb3c78..c6cf0679aaba 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -1,6 +1,3 @@ -DIST adobe-flash-11.2.202.535-debug.i386.tar.gz 7436270 SHA256 c1e4b10f0cc1ce1f00bac4f3d8e8289bbea5d257b9efd17cfad33f78a7b03d42 SHA512 394249b9a94d83f945136f232a750f4584790391335e45b5206dab921e9da87c945799282e8141cf36740d3508beb280eddaaee5916cd789da10f7eb53947031 WHIRLPOOL be8fbb5440bf6f3212fc278915b5c1414763c68d2bb8a4825f4167930fa255c4ea4a683ad0c5d053267cbfde5a87bdc2315ca177eea9568c3c6e719b34e8876b -DIST adobe-flash-11.2.202.535.i386.tar.gz 6954088 SHA256 da480341900a475ce26ff5b6a8af18b500675d6fed98a15f33c83130c3b7297d SHA512 da8e1227f166ac377990b44b5657fc59df8fe3db8247bf4150be67027372ce4ae74dee4151d14f8432cf386a717538ee106d451ec5afbc4800a095947d1c2ccc WHIRLPOOL d25049dab1cc827288daf6bcb0480c0c52098d7d898458cf70cbab4e296f2438f141a4ab536076a95bdeb0c6f83ccd6af02cb19f0cabd563f01080a109682cfa -DIST adobe-flash-11.2.202.535.x86_64.tar.gz 7267961 SHA256 f727fe6b56555093b66089bce63dfa7cdd2c817a70e9800027db2e7a0541de8d SHA512 a89df355190fb2afa3264299c1d1bb4c94fa34f9f5bd87cdd82ef4d9afc2f9841a376152b4c9a66dbdb543f484a09547348acff7e4a39c526d27c46ea5fc5b7e WHIRLPOOL ef8be587c2209768738cee784ab8780b00b9534d1bbb0c12af29753bd26f131638a1d4d5704edb7a9472fbf0159ddf50e2e4b64326f7e31f80a8090e3bc0b91f DIST adobe-flash-11.2.202.540-debug.i386.tar.gz 7436356 SHA256 140b9023c07826548b3c3f23e55673b5436e158c4719fde01d129191b09c1bec SHA512 aa31a5a93047549089be80eb0e84de88a110748517796f72594e37ca10e6c9c3439d58b152c443f0b9deda5c7baa371330d65f15e72765d0e8ab6f46d0b6f8f9 WHIRLPOOL c6e67510f47b51dd192f6886f5461e6612f11b1debafab2ed04355f02d912bf242aa0519540b6e9a4794811995666fededf4155e8323678257d669d60c58a383 DIST adobe-flash-11.2.202.540.i386.tar.gz 6954096 SHA256 7e057c77d6da64d4c5d67fc0fe277980461c037475be433142439f225c9911d9 SHA512 65f03be693a907d218cbfcfa21a0a07cd09d40e0cb8223c9cf7fc0588756b922cc79039ac3b38ba1ccbd7a82cc29fb9c6da2fc312d992232744eecc37ba59637 WHIRLPOOL 2c80f97e6dc4cf4bc184c294a4b93aa6ec224ba6c56fe8a427ca6fa818d0a3d745f69974ae0676e89fc6034e0935312827c2f13ce07b981c4e7300102bfc032d DIST adobe-flash-11.2.202.540.x86_64.tar.gz 7267851 SHA256 262ab05038716cce20ce294cbc29d9ba384f68332f0a14945d3c19038b4dca7f SHA512 55d1e3e5c426b083dcf64eb2de72f12e8a9d0866b6ea21cb524a0bba1895de976e25336f0222266ea912fbbb3cd06ebc4c2166acf933680f8b600ee76bb03985 WHIRLPOOL 85d7b8fd0480632663756db0e1df37b3c2bf3dc0aadb2e9d1443c297c6c7ba552728351e75e2d1fa920fbc995713207a9bcf77fbc2be0c53fe532ecfeaa15c48 diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.535.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.535.ebuild deleted file mode 100644 index a77fb116af07..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-11.2.202.535.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit nsplugins toolchain-funcs versionator multilib multilib-minimal - -DESCRIPTION="Adobe Flash Player" -HOMEPAGE=" - http://www.adobe.com/products/flashplayer.html - http://get.adobe.com/flashplayer/ -" - -AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc" -AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters" -PV_M=$(get_major_version) -AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz" -AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz" -AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz" - -SRC_URI=" - abi_x86_32? ( - !debug? ( ${AF_32_URI} ) - debug? ( ${AF_32_DB_URI} ) - ) - abi_x86_64? ( ${AF_64_URI} ) -" -IUSE="debug kde selinux cpu_flags_x86_sse2" -REQUIRED_USE=" - cpu_flags_x86_sse2 - debug? ( abi_x86_32 ) - || ( abi_x86_64 abi_x86_32 ) -" -SLOT="0" - -KEYWORDS="-* amd64 x86" -LICENSE="AdobeFlash-11.x" -RESTRICT="strip mirror" - -S="${WORKDIR}" - -NATIVE_DEPS=" - dev-libs/atk - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - kde? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - kde-base/kdelibs - x11-libs/libICE - x11-libs/libSM - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libXpm - ) - media-libs/fontconfig - media-libs/freetype - >=sys-libs/glibc-2.4 - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXt - x11-libs/pango -" - -DEPEND=" - amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) -" -RDEPEND=" - ${DEPEND} - abi_x86_64? ( ${NATIVE_DEPS} ) - abi_x86_32? ( - amd64? ( - >=dev-libs/atk-2.10.0[abi_x86_32(-)] - >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] - >=dev-libs/nspr-4.10.4[abi_x86_32(-)] - >=dev-libs/nss-3.15.4[abi_x86_32(-)] - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] - >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] - >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] - >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] - >=x11-libs/libXext-1.3.2[abi_x86_32(-)] - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] - >=x11-libs/libXt-1.1.4[abi_x86_32(-)] - >=x11-libs/pango-1.36.3[abi_x86_32(-)] - ) - x86? ( ${NATIVE_DEPS} ) - ) - || ( media-fonts/liberation-fonts media-fonts/corefonts ) - selinux? ( sec-policy/selinux-flash ) -" - -# Ignore QA warnings in these closed-source binaries, since we can't fix them: -QA_PREBUILT="usr/*" - -any_cpu_missing_flag() { - local value=${1} - grep '^flags' /proc/cpuinfo | grep -qv "${value}" -} - -pkg_setup() { - unset need_lahf_wrapper - if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then - export need_lahf_wrapper=1 - fi -} - -src_unpack() { - local files=( ${A} ) - - multilib_src_unpack() { - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - # we need to filter out the other archive(s) - local other_abi - [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64 - unpack ${files[@]//*${other_abi}*/} - } - - multilib_parallel_foreach_abi multilib_src_unpack -} - -src_configure() { :; } - -multilib_src_compile() { - if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then - # This experimental wrapper, from Maks Verver via bug #268336 should - # emulate the missing lahf instruction affected platforms. - set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \ - -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c" - echo "${@}" >&2 - "${@}" || die "Compile of flashplugin-lahf-fix.so failed" - fi -} - -multilib_src_install() { - # PLUGINS_DIR comes from nsplugins.eclass - exeinto /usr/$(get_libdir)/${PLUGINS_DIR} - doexe libflashplayer.so - - if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then - # This experimental wrapper, from Maks Verver via bug #268336 should - # emulate the missing lahf instruction affected platforms. - doexe flashplugin-lahf-fix.so - fi - - if multilib_is_native_abi; then - if use kde; then - local pkglibdir=lib - [[ -d usr/lib64 ]] && pkglibdir=lib64 - - exeinto /usr/$(get_libdir)/kde4 - doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so - insinto /usr/share/kde4/services - doins usr/share/kde4/services/kcm_adobe_flash_player.desktop - else - # No KDE applet, so allow the GTK utility to show up in KDE: - sed -i usr/share/applications/flash-player-properties.desktop \ - -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed" - fi - - # The userland 'flash-player-properties' standalone app: - dobin usr/bin/flash-player-properties - - # Icon and .desktop for 'flash-player-properties' - insinto /usr/share - doins -r usr/share/{icons,applications} - dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \ - /usr/share/pixmaps/flash-player-properties.png - fi - - # The magic config file! - insinto "/etc/adobe" - doins "${FILESDIR}/mms.cfg" -} - -unregister_pluginwrapper() { - # TODO: Perhaps parse the output of 'nspluginwrapper -l' - # TODO: However, the 64b flash plugin makes - # TODO: 'nspluginwrapper -l' segfault. - local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so" - if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then - einfo "Removing 32-bit plugin wrapper" - nspluginwrapper -r "${FLASH_WRAPPER}" - fi -} - -pkg_postinst() { - if use amd64 ; then - if [[ ${need_lahf_wrapper} ]]; then - ewarn "Your processor does not support the 'lahf' instruction which is used" - ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which" - ewarn "should allow this plugin to run. If you encounter problems, please" - ewarn "adjust your USE flags to install only the 32-bit version and reinstall:" - ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]" - elog - fi - # needed to clean up upgrades from older installs - if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then - unregister_pluginwrapper - fi - if has_version 'www-plugins/nspluginwrapper'; then - if use abi_x86_32 && ! use abi_x86_64; then - einfo "nspluginwrapper detected: Installing plugin wrapper" - local oldabi="${ABI}" - ABI="x86" - local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so" - nspluginwrapper -i "${FLASH_SOURCE}" - ABI="${oldabi}" - fi - elif use abi_x86_32; then - elog "To use the 32-bit flash player in a native 64-bit browser," - elog "you must install www-plugins/nspluginwrapper" - fi - fi -} - -pkg_prerm() { - use amd64 && use abi_x86_32 && ! use abi_x86_64 && \ - unregister_pluginwrapper -} diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.540.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.540.ebuild index 162eb06b6e71..a77fb116af07 100644 --- a/www-plugins/adobe-flash/adobe-flash-11.2.202.540.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.540.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" " SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" LICENSE="AdobeFlash-11.x" RESTRICT="strip mirror"