From ba691b9efa28de6eecc71d3875a3ab42422a446e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Dec 2012 10:28:20 +0400 Subject: [PATCH] Sync with portage [Thu Dec 27 10:28:19 MSK 2012]. --- dev-cpp/gtkmm/gtkmm-3.6.0.ebuild | 4 +- .../happy/files/happy-1.18.6-man.patch | 12 ++++ dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild | 5 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/dev-cpp/gtkmm-3.6.0 | 4 +- metadata/md5-cache/dev-python/PyQt4-4.9.6-r1 | 2 +- .../md5-cache/net-libs/webkit-gtk-1.10.2-r300 | 14 ++--- metadata/md5-cache/net-wireless/uhd-3.5.0 | 12 ++++ metadata/md5-cache/x11-libs/gtk+-3.6.2 | 4 +- .../x11-themes/gnome-themes-standard-3.6.1 | 13 ---- .../x11-themes/gnome-themes-standard-3.6.2 | 6 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- .../webkit-gtk/webkit-gtk-1.10.2-r300.ebuild | 24 ++++--- net-wireless/uhd/Manifest | 2 + net-wireless/uhd/uhd-3.5.0.ebuild | 44 +++++++++++++ profiles/arch/alpha/package.use.mask | 6 +- profiles/arch/ia64/package.use.mask | 10 ++- profiles/arch/powerpc/package.use.mask | 11 +++- profiles/arch/sparc/package.use.mask | 6 +- profiles/package.mask | 6 +- x11-libs/gtk+/gtk+-3.6.2.ebuild | 4 +- x11-themes/gnome-themes-standard/Manifest | 1 - .../gnome-themes-standard-3.6.1.ebuild | 62 ------------------- .../gnome-themes-standard-3.6.2.ebuild | 7 +-- 28 files changed, 141 insertions(+), 130 deletions(-) create mode 100644 dev-haskell/happy/files/happy-1.18.6-man.patch create mode 100644 metadata/md5-cache/net-wireless/uhd-3.5.0 delete mode 100644 metadata/md5-cache/x11-themes/gnome-themes-standard-3.6.1 create mode 100644 net-wireless/uhd/uhd-3.5.0.ebuild delete mode 100644 x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild diff --git a/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild index 671ee49a3511..3a6ab553feef 100644 --- a/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild +++ b/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild,v 1.2 2012/12/24 15:40:22 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild,v 1.3 2012/12/27 05:05:55 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org" LICENSE="LGPL-2.1" SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="aqua doc examples test wayland +X" REQUIRED_USE="|| ( aqua wayland X )" diff --git a/dev-haskell/happy/files/happy-1.18.6-man.patch b/dev-haskell/happy/files/happy-1.18.6-man.patch new file mode 100644 index 000000000000..cd5558cc6607 --- /dev/null +++ b/dev-haskell/happy/files/happy-1.18.6-man.patch @@ -0,0 +1,12 @@ +Tue Aug 2 12:16:38 EEST 2011 Sergei Trofimovich + * doc: make happy.1 be buildabale with doc/configure +diff -rN -u old-happy/doc/configure.ac new-happy/doc/configure.ac +--- old-happy/doc/configure.ac 2011-08-02 12:24:20.913926740 +0300 ++++ new-happy/doc/configure.ac 2011-08-02 12:24:20.923926615 +0300 +@@ -9,5 +9,5 @@ + + AC_PATH_PROG(DbLatexCmd,dblatex) + +-AC_CONFIG_FILES([config.mk]) ++AC_CONFIG_FILES([config.mk happy.1]) + AC_OUTPUT diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild index 194d4448b316..cd8356e55fc7 100644 --- a/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild +++ b/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild,v 1.1 2012/12/26 03:11:43 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild,v 1.2 2012/12/27 04:20:42 pesa Exp $ EAPI=5 @@ -27,7 +27,6 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns" - REQUIRED_USE=" declarative? ( X ) help? ( X ) @@ -103,7 +102,7 @@ src_prepare() { } pyqt4_use_enable() { - use $1 && echo --enable=${2:-Qt$(echo ${1:0:1} | tr '[:lower:]' '[:upper:]')${1:1}} + use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}} } src_configure() { diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index dbd8fa344b04..d275e96b0110 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Thu, 27 Dec 2012 04:06:50 +0000 +Thu, 27 Dec 2012 05:36:51 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index dbd8fa344b04..d275e96b0110 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Thu, 27 Dec 2012 04:06:50 +0000 +Thu, 27 Dec 2012 05:36:51 +0000 diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.6.0 b/metadata/md5-cache/dev-cpp/gtkmm-3.6.0 index 7a5172d2e03d..4987f6fd3ae7 100644 --- a/metadata/md5-cache/dev-cpp/gtkmm-3.6.0 +++ b/metadata/md5-cache/dev-cpp/gtkmm-3.6.0 @@ -4,11 +4,11 @@ DESCRIPTION=C++ interface for GTK+ EAPI=5 HOMEPAGE=http://www.gtkmm.org IUSE=aqua doc examples test wayland +X -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris LICENSE=LGPL-2.1 RDEPEND=>=dev-cpp/glibmm-2.34:2 >=x11-libs/gtk+-3.5.12:3[aqua?,wayland?,X?] >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.9.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2 REQUIRED_USE=|| ( aqua wayland X ) SLOT=3.0 SRC_URI=mirror://gnome/sources/gtkmm/3.6/gtkmm-3.6.0.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 18cda077fa5f661f96aa70c192b4b4a5 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=fdd6a1cac6f9ea07c3a459d29d93bfdc +_md5_=7c6c3bb5603e4e5955f79cc7b1f49112 diff --git a/metadata/md5-cache/dev-python/PyQt4-4.9.6-r1 b/metadata/md5-cache/dev-python/PyQt4-4.9.6-r1 index 5e9a28c98c23..5343cd9e0cb8 100644 --- a/metadata/md5-cache/dev-python/PyQt4-4.9.6-r1 +++ b/metadata/md5-cache/dev-python/PyQt4-4.9.6-r1 @@ -11,4 +11,4 @@ REQUIRED_USE=declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phon SLOT=0 SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.9.6.tar.gz _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python e5b3412fa9f03670a666c8a137bd1060 qt4-r2 19af9102ca9b827213997cc636e7e33c toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=0dc446d7dbe65559a254ac8b4b8c735a +_md5_=e8dfd3d400c8627a33282c64030e1b9e diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300 index ce95e712a398..db8ea3748cc0 100644 --- a/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300 +++ b/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare pretend setup test -DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.39.2:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender >=x11-libs/gtk+-2.13:2 geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) dev-lang/perl dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) app-accessibility/at-spi2-core >=dev-util/gtk-doc-am-1.10 dev-util/gperf sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) +DEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg:= >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.39.2:2.4[introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.21 x11-libs/libXrender >=x11-libs/gtk+-2.13:2 geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) dev-lang/perl =dev-lang/python-2* || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) app-accessibility/at-spi2-core >=dev-util/gtk-doc-am-1.10 dev-util/gperf sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) DESCRIPTION=Open source web browser engine EAPI=5 HOMEPAGE=http://www.webkitgtk.org/ -IUSE=aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7 test -KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos +IUSE=aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl test +KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos LICENSE=LGPL-2+ BSD -RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.39.2:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender >=x11-libs/gtk+-2.13:2 geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) -REQUIRED_USE=introspection? ( geoloc gstreamer ) || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ^^ ( python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7 ) python_single_target_python2_5? ( python_targets_python2_5 ) python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) +RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg:= >=media-libs/libpng-1.4:0= >=x11-libs/cairo-1.10:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1:= >=net-libs/libsoup-2.39.2:2.4[introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.21 x11-libs/libXrender >=x11-libs/gtk+-2.13:2 geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite x11-libs/libXdamage ) +REQUIRED_USE=introspection? ( geoloc gstreamer ) SLOT=3 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-1.10.2.tar.xz -_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f check-reqs 0efdf29c9002a1995388968bf54e9d3d eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 61ad55e732e494378165e7dcd4744b91 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf python-single-r1 50388199dfecdef7b878a1b0a1349715 python-utils-r1 dcd8a7e28a2e90a45fc1875429811c73 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=8ba57b6ea5ab460dcc0bda59c53286b1 +_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f check-reqs 0efdf29c9002a1995388968bf54e9d3d eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 61ad55e732e494378165e7dcd4744b91 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_md5_=bb0a0d2f0fdfd9a93a90e3f93ab5a759 diff --git a/metadata/md5-cache/net-wireless/uhd-3.5.0 b/metadata/md5-cache/net-wireless/uhd-3.5.0 new file mode 100644 index 000000000000..187a05409831 --- /dev/null +++ b/metadata/md5-cache/net-wireless/uhd-3.5.0 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=virtual/libusb:1 dev-libs/boost dev-python/cheetah || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver +EAPI=4 +HOMEPAGE=http://code.ettus.com/redmine/ettus/projects/uhd/wiki +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3 +RDEPEND=virtual/libusb:1 dev-libs/boost || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) +SLOT=0 +SRC_URI=https://github.com/EttusResearch/UHD-Mirror/tarball/release_003_005_000 -> EttusResearch-UHD-Mirror-3.5.0.tar.gz http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.005.000-release.tar.gz +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 61ad55e732e494378165e7dcd4744b91 multilib 9aa8a023e062fca0ba79362d9d0cc488 python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=3e286870488c4059203b6bb4d619eb42 diff --git a/metadata/md5-cache/x11-libs/gtk+-3.6.2 b/metadata/md5-cache/x11-libs/gtk+-3.6.2 index a14d1977e28d..4afb759aa893 100644 --- a/metadata/md5-cache/x11-libs/gtk+-3.6.2 +++ b/metadata/md5-cache/x11-libs/gtk+-3.6.2 @@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit + EAPI=5 HOMEPAGE=http://www.gtk.org/ IUSE=aqua colord cups debug egl examples +introspection packagekit test vim-syntax wayland X xinerama test -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=LGPL-2+ PDEPEND=vim-syntax? ( app-vim/gtk-syntax ) RDEPEND=X? ( >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) wayland? ( >=dev-libs/wayland-0.95 media-libs/mesa[egl?,wayland] x11-libs/libxkbcommon egl? ( x11-libs/cairo[opengl] ) ) >=dev-libs/glib-2.33.1 >=x11-libs/pango-1.30[introspection?] >=dev-libs/atk-2.5.3[introspection?] >=x11-libs/cairo-1.10.0:=[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2:= ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) !=x11-libs/gtk+-3.5.17:3[X] ) >=x11-themes/gtk-engines-2.15.3:2 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 -DESCRIPTION=Adwaita theme for GNOME Shell -EAPI=4 -HOMEPAGE=http://www.gnome.org/ -IUSE=+gtk -KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris -LICENSE=LGPL-2.1+ -RDEPEND=gnome-base/librsvg:2 x11-libs/cairo gtk? ( x11-libs/gtk+:2 >=x11-libs/gtk+-3.5.17:3[X] ) >=x11-themes/gtk-engines-2.15.3:2 >=gnome-base/gsettings-desktop-schemas-3.4 !=x11-themes/gtk-engines-2.15.3:2 gtk? ( x11-libs/gtk+:2 >=x11-libs/gtk+-3.5.17:3 ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 DESCRIPTION=Adwaita theme for GNOME Shell -EAPI=4 +EAPI=5 HOMEPAGE=http://www.gnome.org/ IUSE=+gtk -KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris +KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris LICENSE=LGPL-2.1+ RDEPEND=gnome-base/librsvg:2 x11-libs/cairo >=x11-themes/gtk-engines-2.15.3:2 gtk? ( x11-libs/gtk+:2 >=x11-libs/gtk+-3.5.17:3 ) >=gnome-base/gsettings-desktop-schemas-3.4 !=dev-libs/gobject-introspection-0.9.5 ) - spell? ( >=app-text/enchant-0.22 ) + spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite @@ -52,7 +51,7 @@ RDEPEND=" # paxctl needed for bug #407085 DEPEND="${RDEPEND} dev-lang/perl - ${PYTHON_DEPS} + =dev-lang/python-2* || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) app-accessibility/at-spi2-core @@ -89,8 +88,6 @@ pkg_setup() { einfo "it may still not be enough, as the total space requirements " einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features." fi - # Needed for CodeGeneratorInspector.py - python-single-r1_pkg_setup } src_prepare() { @@ -183,10 +180,11 @@ src_configure() { $(use_enable webgl) --with-gtk=3.0 --with-gstreamer=1.0 - --with-accelerated-compositing + --enable-accelerated-compositing --enable-dependency-tracking --disable-gtk-doc - $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" + PYTHON=$(type -P python2) + "$(usex aqua "--with-font-backend=pango --with-target=quartz" "") # Aqua support in gtk3 is untested if has_version "virtual/rubygems[ruby_targets_ruby19]"; then diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index df822fa2672b..ccfd51ea4b33 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -1,2 +1,4 @@ DIST EttusResearch-UHD-Mirror-3.4.3.tar.gz 6215038 SHA256 536b3b1ba7c9bb1b7c87c197708083b47efb3b3cdc14b841230f093fa915961b SHA512 bd028a0c1129da443e7b10ada4033cc99a6243b74640ecc5ac9b1a115b654dd3ce29a98048d33d6bced12bdda8d982d6dbdd1d64604bb74e8fa7294427e9080a WHIRLPOOL ff2af445b501e653990aa16a7f9be0d027c2cc87a435587233a69e79684cb852f3f9d39505a05746a2f5be17e3e3c756202e6cfe3a9f8da97c7cfb8e208350fb +DIST EttusResearch-UHD-Mirror-3.5.0.tar.gz 6258061 SHA256 c6f8899cb891713acb436daa29d31606c73b0f46685075847430513d6ae7a789 SHA512 a5a7146a3fb5d82be20f23f02364c88a4642717ccdbda60cda51fb939c9cf768becb2e74c926be6222eea882ab775c6352c2658c0985f8f745c7cc14ad80ecf6 WHIRLPOOL f6194482f64da5563784d5608dbd72232497666aa4290d305881622fe6fc8de13df3ade00e83460483e69d1ef878d1ea8292e2f49d72b264d1dc134fab7d459b DIST uhd-images_003.004.002-12-geb083300.tar.gz 6930847 SHA256 274c8538bde9cdb00d09b65bbd8eff3d57801bee1d03ce9d47037c313639561d SHA512 fd802d29b2a382ee31b42b57c5a558ff1f04b652d466a10619d29227742b875f656376fea8d69770688bbe5b6f03e00df8ef600a649103ed293d9d4ea2455983 WHIRLPOOL 0d248f1d6528b82ea23d18b13ece56f4915e31cb6a32a43444d648a472d511a02d3b1791b6e4028560025a795f45ed5c788dd511d706bde647ebff4f95d55a22 +DIST uhd-images_003.005.000-release.tar.gz 7212387 SHA256 352fbf69fbfff03a02b5d9b3c398771db40e4c5b77f99f0fdbff67c547cc0d18 SHA512 114a890d0282b30e7846579c4320bcfc4d027097628c83289763fd9802d58e86c082e2b701934bde35eb9cec121945a9652c535ebc58dd8df5af8ae3d9f69be3 WHIRLPOOL 505dc498d28876b514afa5d74fe336ba6c0cf9fd91c85b34620616b91c0e46c734660af01ce2bca4cf95edb09e3d11bba8f9fb3e01defa061e4de615cc6e36bb diff --git a/net-wireless/uhd/uhd-3.5.0.ebuild b/net-wireless/uhd/uhd-3.5.0.ebuild new file mode 100644 index 000000000000..7fe08313ad70 --- /dev/null +++ b/net-wireless/uhd/uhd-3.5.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/uhd-3.5.0.ebuild,v 1.1 2012/12/27 04:53:40 zerochaos Exp $ + +EAPI=4 +PYTHON_DEPEND="2:2.6" +inherit versionator python cmake-utils + +DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver" +HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki" + +image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).000-release +SRC_URI="https://github.com/EttusResearch/UHD-Mirror/tarball/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3) -> EttusResearch-UHD-Mirror-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \ + http://files.ettus.com/binaries/maint_images/archive/${image_version}.tar.gz" +#https://github.com/EttusResearch/UHD-Mirror/tags +#http://files.ettus.com/binaries/master_images/archive +KEYWORDS="~amd64 ~x86" +S="${WORKDIR}"/EttusResearch-UHD-Mirror-6ef9f96/host + +LICENSE="GPL-3" +SLOT="0" +IUSE="" +RDEPEND="virtual/libusb:1 + dev-libs/boost" +DEPEND="${RDEPEND} + dev-python/cheetah" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + #this may not be needed in 3.4.3 and above, please verify + sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt +} + +src_install() { + cmake-utils_src_install + insinto /lib/udev/rules.d/ + doins "${S}"/utils/uhd-usrp.rules + insinto /usr/share/${PN} + doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images +} diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 397f117d4b02..b27f1a6ae3f2 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.107 2012/12/15 18:17:07 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.108 2012/12/27 05:31:22 tetromino Exp $ + +# Alexandre Rostovtsev (27 Dec 2012) +# remove mask when dev-libs/libzeitgeist is keyworded here +>=dev-libs/folks-0.8 telepathy # Alexandre Rostovtsev (15 Dec 2012) # media-video/coherence not keyworded diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index aa6148d13ed7..5c6687fe9110 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -1,6 +1,14 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.97 2012/12/19 16:49:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.99 2012/12/27 05:31:22 tetromino Exp $ + +# Alexandre Rostovtsev (27 Dec 2012) +# remove mask when dev-libs/libzeitgeist is keyworded here +>=dev-libs/folks-0.8 telepathy + +# Alexandre Rostovtsev (26 Dec 2012) +# remove when app-accessibility/at-spi2-core is stable for ia64 +=net-libs/webkit-gtk-1.8.3-r300 webkit2 # Agostino Sarubbo (18 Dec 2012) # mask connman because requires to much depend still not keyworded diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index f6b20f9d631d..a3d08be783e7 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -1,6 +1,15 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.147 2012/12/12 16:27:10 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.149 2012/12/27 05:31:23 tetromino Exp $ + +# Alexandre Rostovtsev (27 Dec 2012) +# remove mask when dev-libs/libzeitgeist is keyworded on ppc/ppc64 +>=dev-libs/folks-0.8 telepathy + +# Alexandre Rostovtsev (27 Dec 2012) +# remove mask when x11-misc/colord is stable on ppc/ppc64 +=x11-libs/gtk+-3.2.4-r1 colord +=x11-libs/gtk+-3.4.4 colord # Anthony G. Basile (15 Nove 2012) # Mask telepathy, no stable net-libs/telepathy-qt, bug #441456 diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 8f9cf985e111..495c0f3d2192 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.117 2012/11/01 23:51:35 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.118 2012/12/27 05:31:23 tetromino Exp $ + +# Alexandre Rostovtsev (27 Dec 2012) +# remove mask when dev-libs/libzeitgeist is keyworded here +>=dev-libs/folks-0.8 telepathy # Robin H Johnson (01 Nov 2012) # MySQL 5.5 wants systemtap, tcmalloc & jemalloc diff --git a/profiles/package.mask b/profiles/package.mask index 4331f0487309..251b4be67888 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14334 2012/12/26 22:52:22 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14335 2012/12/27 04:19:22 tetromino Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -324,10 +324,6 @@ net-misc/libteam # Mask development releases =media-libs/libraw-0.15* -# Naohiro Aota (14 Oct 2012) -# Mask unstable ibus which relies on masked version of dconf. -=app-i18n/ibus-1.4.99.20121006 - # Robin H. Johnson (08 Oct 2012) # Masked for testing =sys-libs/db-5.3* diff --git a/x11-libs/gtk+/gtk+-3.6.2.ebuild b/x11-libs/gtk+/gtk+-3.6.2.ebuild index bec32d1d9f64..95f6ea5cd63a 100644 --- a/x11-libs/gtk+/gtk+-3.6.2.ebuild +++ b/x11-libs/gtk+/gtk+-3.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.6.2.ebuild,v 1.3 2012/12/16 06:40:24 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.6.2.ebuild,v 1.4 2012/12/27 04:52:53 tetromino Exp $ EAPI="5" @@ -21,7 +21,7 @@ REQUIRED_USE=" || ( aqua wayland X ) xinerama? ( X )" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # FIXME: introspection data is built against system installation of gtk+:3 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest index 067310d3a206..2f184de227d9 100644 --- a/x11-themes/gnome-themes-standard/Manifest +++ b/x11-themes/gnome-themes-standard/Manifest @@ -1,3 +1,2 @@ DIST gnome-themes-standard-3.4.2.tar.xz 3086124 SHA256 aa29d23708e3357775fb7ea2de14b90551a2c732fce297f3372dae005374c3a8 SHA512 33baa6b8630054d12511852037fcd7c6bf8b8dc77f2b05a9ffb94f8a0405fc81546239fc3a9e9632dc5c610a1d08706531774440fadd58b63f5500df0fe39115 WHIRLPOOL f10eb080454d65ff17d000a7e37e8558afd6b0db161ff0b512e21d00f0bfe91cdb2155514609d773c00b3188e15d3ecd1f3f7fb52856be59235417ea4a5be321 -DIST gnome-themes-standard-3.6.1.tar.xz 3605976 SHA256 f56dd1f593b0a853041b54f9167aab0cb3689ced9cd8f8f4d777c3116bb4878a SHA512 317f12cd03ed5b0032c1c26e9f5a57b9df6a3b799e627a2af6dd54b1fc877fb30c62325434d6a3156d9dbc2f8fefbdb835148448604fa969a8a3edf5a3043f98 WHIRLPOOL 05a9d32309cf4eefda1a9875256a67ca06531fcb9d437f0ac89814a7d6051ef643c694117f97e045fd101a4b60ab9b8573aceaa12b8bdf0551241643458944aa DIST gnome-themes-standard-3.6.2.tar.xz 3609716 SHA256 c41503d0e18e17188c4fd1be5f6a7e90b08564e2a19d9a318b145a56d4455352 SHA512 79ab14e64ac7de06de0c887a73d91b2275f84a870e7799eca1745773598507016d068cf895a7a5f2bcc743cc259703281738e06e4ca6e7cd815840aadb8c9106 WHIRLPOOL fc4e3cd83b5b29fff902ea9c3c5c5456512e9ffac4b7088870c33311edaa168c17149ed59ea5f2b3dd98612b95c0c4dd160251f38660f926b066744950d8fd3f diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild deleted file mode 100644 index d358b6df8f81..000000000000 --- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild,v 1.1 2012/10/17 07:39:33 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="Adwaita theme for GNOME Shell" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="+gtk" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -COMMON_DEPEND="gnome-base/librsvg:2 - x11-libs/cairo - gtk? ( - x11-libs/gtk+:2 - >=x11-libs/gtk+-3.5.17:3[X] ) - >=x11-themes/gtk-engines-2.15.3:2" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig" -# gnome-themes{,-extras} are OBSOLETE for GNOME 3 -# http://comments.gmane.org/gmane.comp.gnome.desktop/44130 -# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose -# their default background image -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gsettings-desktop-schemas-3.4 - !