commit: c870f1968b7ca5ed33989498a434bf5849ebdfe4 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Fri Apr 3 19:55:37 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Apr 3 19:55:37 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=c870f196
x11-libs/gtk+: tree version works because docbook DTD bug is fixed. x11-libs/gtk+/files/settings.ini | 4 - x11-libs/gtk+/gtk+-3.10.8-r99.ebuild | 218 ---------------------------------- x11-libs/gtk+/gtk+-3.12.2-r99.ebuild | 221 ----------------------------------- x11-libs/gtk+/metadata.xml | 21 ---- 4 files changed, 464 deletions(-) diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini deleted file mode 100644 index a65c0a8..0000000 --- a/x11-libs/gtk+/files/settings.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Settings] -gtk-theme-name = Adwaita -gtk-icon-theme-name = gnome -gtk-cursor-theme-name = Adwaita diff --git a/x11-libs/gtk+/gtk+-3.10.8-r99.ebuild b/x11-libs/gtk+/gtk+-3.10.8-r99.ebuild deleted file mode 100644 index 513f081..0000000 --- a/x11-libs/gtk+/gtk+-3.10.8-r99.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.10.8.ebuild,v 1.13 2014/05/02 09:11:41 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit flag-o-matic gnome2 multilib virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="3" -# NOTE: This gtk+ has multi-gdk-backend support, see: -# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ -# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html -# I tried this and got it all compiling, but the end result is unusable as it -# horribly mixes up the backends -- grobian -IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X )" - -KEYWORDS="amd64 arm ~mips ppc x86" - -# 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) -# Use gtk+:2 for gtk-update-icon-cache -COMMON_DEPEND=" - >=dev-libs/atk-2.7.5[introspection?] - >=dev-libs/glib-2.37.5:2 - media-libs/fontconfig - >=x11-libs/cairo-1.12[aqua?,glib,svg,X?] - >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?] - >=x11-libs/gtk+-2.24:2 - >=x11-libs/pango-1.32.4[introspection?] - x11-misc/shared-mime-info - - colord? ( >=x11-misc/colord-0.1.9:0= ) - cups? ( >=net-print/cups-1.2 ) - introspection? ( >=dev-libs/gobject-introspection-1.32 ) - wayland? ( - >=dev-libs/wayland-1.2 - media-libs/mesa[wayland] - >=x11-libs/libxkbcommon-0.2 - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3 - x11-libs/libXrender - x11-libs/libX11 - >=x11-libs/libXi-1.3 - x11-libs/libXext - >=x11-libs/libXrandr-1.3 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - xinerama? ( x11-libs/libXinerama ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.20 - sys-devel/gettext - virtual/pkgconfig - X? ( - x11-proto/xextproto - x11-proto/xproto - x11-proto/inputproto - x11-proto/damageproto - xinerama? ( x11-proto/xineramaproto ) - ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -# >=xorg-server-1.11.4 needed for -# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gail-1000 - !<x11-libs/vte-0.31.0:2.90 - packagekit? ( app-admin/packagekit-base ) - X? ( !<x11-base/xorg-server-1.11.4 ) -" -PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -src_prepare() { - # -O3 and company cause random crashes in applications. Bug #133469 - replace-flags -O3 -O2 - strip-flags - - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.am - strip_builddir SRC_SUBDIRS testsuite Makefile.in - strip_builddir SRC_SUBDIRS tests Makefile.am - strip_builddir SRC_SUBDIRS tests Makefile.in - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.am - strip_builddir SRC_SUBDIRS demos Makefile.in - strip_builddir SRC_SUBDIRS examples Makefile.am - strip_builddir SRC_SUBDIRS examples Makefile.in - fi - - gnome2_src_prepare -} - -src_configure() { - # Passing --disable-debug is not recommended for production use - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - gnome2_src_configure \ - $(use_enable aqua quartz-backend) \ - $(use_enable colord) \ - $(use_enable cups cups auto) \ - $(usex debug --enable-debug=yes "") \ - $(use_enable introspection) \ - $(use_enable packagekit) \ - $(use_enable wayland wayland-backend) \ - $(use_enable X x11-backend) \ - $(use_enable X xcomposite) \ - $(use_enable X xdamage) \ - $(use_enable X xfixes) \ - $(use_enable X xkb) \ - $(use_enable X xrandr) \ - $(use_enable xinerama) \ - --disable-papi \ - --disable-man \ - --enable-gtk2-dependency \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - --libdir="${EPREFIX}/usr/$(get_libdir)" -} - -src_test() { - # Tests require a new gnome-themes-standard, but adding it to DEPEND - # would result in circular dependencies. - # https://bugzilla.gnome.org/show_bug.cgi?id=669562 - if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then - ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]" - ewarn "is not installed. Please re-run tests after installing the" - ewarn "required version of gnome-themes-standard." - return 0 - fi - - # FIXME: this should be handled at eclass level - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - - unset DBUS_SESSION_BUS_ADDRESS - GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check -} - -src_install() { - gnome2_src_install - - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - # add -framework Carbon to the .pc files - if use aqua ; then - for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do - sed -e "s:Libs\: :Libs\: -framework Carbon :" \ - -i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" - done - fi -} - -pkg_preinst() { - gnome2_pkg_preinst - - # Make sure loaders.cache belongs to gdk-pixbuf alone - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - gnome2_query_immodules_gtk3 - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your settings.ini file." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSIONS} ]]; then - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache - fi -} diff --git a/x11-libs/gtk+/gtk+-3.12.2-r99.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r99.ebuild deleted file mode 100644 index ef74838..0000000 --- a/x11-libs/gtk+/gtk+-3.12.2-r99.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2.ebuild,v 1.1 2014/05/31 07:59:34 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit flag-o-matic gnome2 multilib virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="3" -# NOTE: This gtk+ has multi-gdk-backend support, see: -# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ -# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html -# I tried this and got it all compiling, but the end result is unusable as it -# horribly mixes up the backends -- grobian -IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" - -# 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) -# Use gtk+:2 for gtk-update-icon-cache -COMMON_DEPEND=" - >=dev-libs/atk-2.7.5[introspection?] - >=dev-libs/glib-2.39.5:2 - media-libs/fontconfig - >=x11-libs/cairo-1.12[aqua?,glib,svg,X?] - >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?] - >=x11-libs/gtk+-2.24:2 - >=x11-libs/pango-1.32.4[introspection?] - x11-misc/shared-mime-info - - cloudprint? ( - >=net-libs/rest-0.7 - >=dev-libs/json-glib-1.0 ) - colord? ( >=x11-misc/colord-0.1.9:0= ) - cups? ( >=net-print/cups-1.2 ) - introspection? ( >=dev-libs/gobject-introspection-1.39 ) - wayland? ( - >=dev-libs/wayland-1.3.90 - media-libs/mesa[wayland] - >=x11-libs/libxkbcommon-0.2 - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3 - x11-libs/libXrender - x11-libs/libX11 - >=x11-libs/libXi-1.3 - x11-libs/libXext - >=x11-libs/libXrandr-1.3 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - xinerama? ( x11-libs/libXinerama ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.20 - sys-devel/gettext - virtual/pkgconfig - X? ( - x11-proto/xextproto - x11-proto/xproto - x11-proto/inputproto - x11-proto/damageproto - xinerama? ( x11-proto/xineramaproto ) - ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -# >=xorg-server-1.11.4 needed for -# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gail-1000 - !<x11-libs/vte-0.31.0:2.90 - X? ( !<x11-base/xorg-server-1.11.4 ) -" -PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -src_prepare() { - # -O3 and company cause random crashes in applications. Bug #133469 - replace-flags -O3 -O2 - strip-flags - - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.am - strip_builddir SRC_SUBDIRS testsuite Makefile.in - strip_builddir SRC_SUBDIRS tests Makefile.am - strip_builddir SRC_SUBDIRS tests Makefile.in - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.am - strip_builddir SRC_SUBDIRS demos Makefile.in - strip_builddir SRC_SUBDIRS examples Makefile.am - strip_builddir SRC_SUBDIRS examples Makefile.in - fi - - gnome2_src_prepare -} - -src_configure() { - # Passing --disable-debug is not recommended for production use - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - gnome2_src_configure \ - $(use_enable aqua quartz-backend) \ - $(use_enable cloudprint) \ - $(use_enable colord) \ - $(use_enable cups cups auto) \ - $(usex debug --enable-debug=yes "") \ - $(use_enable introspection) \ - $(use_enable wayland wayland-backend) \ - $(use_enable X x11-backend) \ - $(use_enable X xcomposite) \ - $(use_enable X xdamage) \ - $(use_enable X xfixes) \ - $(use_enable X xkb) \ - $(use_enable X xrandr) \ - $(use_enable xinerama) \ - --disable-papi \ - --disable-man \ - --enable-gtk2-dependency \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - --libdir="${EPREFIX}"/usr/$(get_libdir) -} - -src_test() { - # Tests require a new gnome-themes-standard, but adding it to DEPEND - # would result in circular dependencies. - # https://bugzilla.gnome.org/show_bug.cgi?id=669562 - if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then - ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]" - ewarn "is not installed. Please re-run tests after installing the" - ewarn "required version of gnome-themes-standard." - return 0 - fi - - # FIXME: this should be handled at eclass level - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - - unset DBUS_SESSION_BUS_ADDRESS - GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check -} - -src_install() { - gnome2_src_install - - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - # add -framework Carbon to the .pc files - if use aqua ; then - for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do - sed -e "s:Libs\: :Libs\: -framework Carbon :" \ - -i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" - done - fi -} - -pkg_preinst() { - gnome2_pkg_preinst - - # Make sure loaders.cache belongs to gdk-pixbuf alone - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - gnome2_query_immodules_gtk3 - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your settings.ini file." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSIONS} ]]; then - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache - fi -} diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml deleted file mode 100644 index f29cdbe..0000000 --- a/x11-libs/gtk+/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>gnome</herd> - <longdescription> - GTK+ is a multi-platform toolkit for creating graphical user - interfaces. Offering a complete set of widgets, GTK+ is suitable - for projects ranging from small one-off projects to complete - application suites. - </longdescription> - <use> - <flag name="cloudprint">Enable printing via Google Cloud Print.</flag> - <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management - in printing</flag> - <flag name="packagekit">Enable support for the distro-neutral package - manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id> - </upstream> -</pkgmetadata>
