Sync with portage [Sun Nov 15 12:02:19 MSK 2015].

mhiretskiy
root 9 years ago
parent 90d7d9879f
commit 6e2564e4d8

@ -1,3 +1,3 @@
DIST at-spi2-core-2.12.0.tar.xz 454668 SHA256 db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89 SHA512 955249568e28441201d0a079e26bd703e21716b9189e372bfa20cda70e1079bbb51f62246cdeb1b914953f448e0432b749d402d723710247f2a1b8b343b37ccc WHIRLPOOL 67870b40b3c0e343b3119bae93b23540f8ab2c71137d033c9b4ee000d28a4c66353dae8a72d815367ac8b291471dd3c21d985a0cdd4c6812e43f95ca1931010a
DIST at-spi2-core-2.14.1.tar.xz 456272 SHA256 eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657 SHA512 263f2353961787b510a22ede6243ebd6f9eba7fe00740b252ba372e78a2b4a20bd6ed1a9f509b2e33342fc5516d1e8b95f886573d51962755e51584771ac86b9 WHIRLPOOL 54d02cd41f1039c3b166c01215d983b768011c99b81831fc3256a4dde66b3a2fbff7b0fafa4958bbce367fee164c5f5c90531de11f57d65a1972af009b5afd62
DIST at-spi2-core-2.16.0.tar.xz 455264 SHA256 1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0 SHA512 b61cb6dad15e2a6f6cd4788e6b63fed37d0098a56d1417b43aed2ba111a7dd7fccbe7c393f0be794bcaf900f38decbd3974c36e395548000d429086f8717df57 WHIRLPOOL 556c504ba9aef2e4ad2b63e3b4d0417ce24a49fafd45287cf3d669612c2d23058f3e7b373a69a569d63938a0333b62d5c601e8a0f1f4b78d0252bea4b64ede3e
DIST at-spi2-core-2.18.3.tar.xz 451408 SHA256 ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629 SHA512 89abc660b49ca690a027709da4e6ed75d84f6c2dae691a0428057da0514f4c7f1f49b946f19c17c6ea402a0f1c9a236921efedb05865756c71beca29a0fbd6f2 WHIRLPOOL eeff01c9859c6e260ac8de5adf3caa69551523c0247659cc657b1885f175120bad7dc69b47b94c9ad78db14fe44011a6caf973a3b053aed64c1cc99dac863ddf

@ -1,50 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils gnome2
DESCRIPTION="D-Bus accessibility specifications and registration daemon"
HOMEPAGE="https://live.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
IUSE="+X +introspection"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
# x11-libs/libSM is needed until upstream #719808 is solved either
# making the dep unneeded or fixing their configure
# Only libX11 is optional right now
RDEPEND="
>=dev-libs/glib-2.36:2
>=sys-apps/dbus-1
x11-libs/libSM
x11-libs/libXi
x11-libs/libXtst
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
X? ( x11-libs/libX11 )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.40
virtual/pkgconfig
"
src_prepare() {
# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
gnome2_src_prepare
}
src_configure() {
# xevie is deprecated/broken since xorg-1.6/1.7
gnome2_src_configure \
--disable-xevie \
$(use_enable introspection) \
$(use_enable X x11)
}

@ -9,34 +9,29 @@ GNOME2_LA_PUNT="yes"
inherit eutils gnome2 multilib-minimal
DESCRIPTION="D-Bus accessibility specifications and registration daemon"
HOMEPAGE="https://live.gnome.org/Accessibility"
HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
IUSE="+X +introspection"
KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="X +introspection"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
# x11-libs/libSM is needed until upstream #719808 is solved either
# making the dep unneeded or fixing their configure
# Only libX11 is optional right now
COMMON_DEPEND="
RDEPEND="
>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
x11-libs/libSM[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
x11-libs/libXtst[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
"
RDEPEND="${COMMON_DEPEND}
abi_x86_32? (
!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
)
"
DEPEND="${COMMON_DEPEND}
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.40
sys-devel/gettext
virtual/pkgconfig[${MULTILIB_USEDEP}]
"

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gnome-accessibility</herd>
<herd>gnome-accessibility</herd>
</pkgmetadata>

@ -27,8 +27,7 @@ DEPEND="
<=dev-python/Babel-2.0[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
<=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.2[${PYTHON_USEDEP}]
@ -82,8 +81,7 @@ RDEPEND="
<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
)
~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
<=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]

@ -28,8 +28,7 @@ DEPEND="
<=dev-python/Babel-2.0[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
<=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.2[${PYTHON_USEDEP}]
@ -83,8 +82,7 @@ RDEPEND="
<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
)
~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
<=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]

@ -1,2 +1 @@
DIST lastpass-cli-0.3.0.tar.gz 48596 SHA256 7956fe945aae64bd57350c3ed89773dd1449b99e8e0369eefcea14382e4aea08 SHA512 9993de2a8d8d66440d318985d1f15ed44033beb9932193f3ef90c5fdc2b598d9b9099d8a0bf871877dbf08014f028fad5305d33cc30bc9b1a7367a582e17002b WHIRLPOOL e7337847500c3a251ed81151517c4f3d8e4a8bd7089195f22748a117aad9c12f36c22471ea84a81ca7e2c4838063dbd852b34a86cf9701749d75278bec7c40ef
DIST lastpass-cli-0.5.0.tar.gz 59237 SHA256 09e7b1e5c1520db2a34a49e7ae07e5b3a7555a4ed2490ed7b56f047065bca812 SHA512 7c34ba4cbf43b299656881766e40302edce1db27fb5eb20bed82fbd141354c7682f49d7dd114af0b1eae512e21f7b334b5bd9b820bac53aa52ad7400a579d925 WHIRLPOOL 443898d70290658900140f4262218b1923eed09a67a0aca18fb1c530a12b466b8362a1f190aaa73586e5ddfb4e843fbce9262e26d4ce2d66e38eed6e59b5820c
DIST lastpass-cli-0.6.0.tar.gz 65047 SHA256 e48f210b34a030e8b8cef3e1d05957aabe757ea4cd31bf03c46b70ddc830733c SHA512 ceaa660e6a7d3b27b09ce6d1d522af216e2c8357859d87034f7f887b53631bf5214b02400f8cb91d0c0020fcfb7889dd0fd8731b1af76a63f94666de2ac4dcd4 WHIRLPOOL 4554d8576e71a0b4c7d69556614a33f3e34d85aec4dd6aa50973ba8eb212864fc45bf3a7cb4e2847cb60a00546e46652cf5baf7f34872ada23431e78078cc6ed

@ -1,37 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
DESCRIPTION="Interfaces with LastPass.com from the command line."
SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
HOMEPAGE="https://github.com/lastpass/lastpass-cli"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
IUSE="X +pinentry"
RDEPEND="
X? ( || ( x11-misc/xclip x11-misc/xsel ) )
dev-libs/openssl:0
net-misc/curl
dev-libs/libxml2
pinentry? ( app-crypt/pinentry )
"
DEPEND="${RDEPEND} app-text/asciidoc"
src_prepare() {
sed -i 's/install -s/install/' Makefile || die "Could not remove stripping"
}
src_compile() {
emake PREFIX="${EPREFIX}/usr"
emake PREFIX="${EPREFIX}/usr" doc-man
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
}

@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
IUSE="ldap nls pam offensive selinux skey +sendmail"
DEPEND="pam? ( virtual/pam )

@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"

@ -0,0 +1,11 @@
--- src/getopt_long.c.orig 2013-12-18 16:05:59.789413528 -0600
+++ src/getopt_long.c 2013-12-18 16:06:01.200420472 -0600
@@ -64,7 +64,7 @@
#ifndef USE_GNU
#include <stdio.h>
-#include <getopt_long.h>
+#include "getopt_long.h"
char *optarg;
int optind;

@ -0,0 +1,53 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit autotools eutils flag-o-matic
MY_P=${PN}-1.14i-ac20050924p1
DESCRIPTION="Utility for creating and opening lzh archives"
HOMEPAGE="http://lha.sourceforge.jp"
SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
LICENSE="lha"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
IUSE=""
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${P}-file-list-from-stdin.patch
"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
)
src_prepare() {
epatch "${PATCHES[@]}"
sed -e '/^AM_C_PROTOTYPES/d' \
-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-i configure.ac || die #423125, 467544
eautoreconf
}
src_configure() {
append-cppflags -DPROTOTYPES #423125
if [[ ${CHOST} == *-interix* ]]; then
export ac_cv_header_inttypes_h=no
export ac_cv_func_iconv=no
fi
econf
}
src_install() {
emake \
DESTDIR="${D}" \
mandir="${EPREFIX}"/usr/share/man/ja \
install
dodoc ChangeLog Hacking_of_LHa
}

@ -20,7 +20,7 @@ fi
SLOT="0"
LICENSE="LGPL-3"
DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government"
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="http://eid.belgium.be"

@ -20,7 +20,7 @@ fi
SLOT="0"
LICENSE="LGPL-3"
DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government"
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="http://eid.belgium.be"

@ -20,7 +20,7 @@ fi
SLOT="0"
LICENSE="LGPL-3"
DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="http://eid.belgium.be"
@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
use gtk || epatch "${FILESDIR}"/gtk_not_required_9999.patch
if [[ ${PV} == "9999" ]] ; then
# Only in current git. Hopefully, in next release.

@ -1,24 +1,11 @@
diff --git a/Makefile.am b/Makefile.am
index 1a605f7..6475886 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I scripts/m4
EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi
xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
index b70e7f2..ac38944 100644
--- a/cardcomm/pkcs11/src/Makefile.am
+++ b/cardcomm/pkcs11/src/Makefile.am
@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 2015-07-27 10:30:34.638418958 +0200
+++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am 2015-08-13 14:12:43.827586821 +0200
@@ -164,29 +164,3 @@
dialogs/dialogsgtk/dlgs_gtk.cpp \
dialogs/dialogsgtk/single_dialog.c
endif
-
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
@ -44,13 +31,10 @@ index b70e7f2..ac38944 100644
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_changepin_LDADD = @GTK_LIBS@
-
pkgconfig_DATA=libbeidpkcs11.pc
diff --git a/configure.ac b/configure.ac
index 102c1c7..efdf0e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,11 +56,6 @@ then
diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
--- eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.641752294 +0200
+++ eid-mw-4.1.4-v4.1.4-b/configure.ac 2015-08-13 14:13:51.456736608 +0200
@@ -55,11 +55,6 @@
fi
fi
@ -62,3 +46,15 @@ index 102c1c7..efdf0e2 100644
###########################################################################
####### read user-specific requests from --enable directives ######
###########################################################################
diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
--- eid-mw-4.1.4-v4.1.4-a/Makefile.am 2015-07-27 10:30:34.638418958 +0200
+++ eid-mw-4.1.4-v4.1.4-b/Makefile.am 2015-08-13 14:11:43.878340486 +0200
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I scripts/m4
EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
+SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage

@ -12,31 +12,48 @@ index 1a605f7..6475886 100644
xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
index b70e7f2..ac38944 100644
index b70e7f2..066c348 100644
--- a/cardcomm/pkcs11/src/Makefile.am
+++ b/cardcomm/pkcs11/src/Makefile.am
@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
@@ -165,30 +165,30 @@ libbeidpkcs11_la_SOURCES += \
dialogs/dialogsgtk/single_dialog.c
endif
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-
+#libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
-beid_askpin_LDADD = @GTK_LIBS@
-
+#beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+#beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+#beid_askpin_LDADD = @GTK_LIBS@
+#
+#beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+#beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+#beid_changepin_LDADD = @GTK_LIBS@
-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_changepin_LDADD = @GTK_LIBS@
-
+#beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+#beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+#beid_badpin_LDADD = @GTK_LIBS@
-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_badpin_LDADD = @GTK_LIBS@
-
+#beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+#beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+#beid_askaccess_LDADD = @GTK_LIBS@
-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_askaccess_LDADD = @GTK_LIBS@
-
+#beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+#beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+#beid_spr_askpin_LDADD = @GTK_LIBS@
-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_askpin_LDADD = @GTK_LIBS@
@ -44,7 +61,10 @@ index b70e7f2..ac38944 100644
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_changepin_LDADD = @GTK_LIBS@
-
+#beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+#beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+#beid_spr_changepin_LDADD = @GTK_LIBS@
pkgconfig_DATA=libbeidpkcs11.pc
diff --git a/configure.ac b/configure.ac
index 102c1c7..efdf0e2 100644

@ -1,3 +1,3 @@
DIST gcr-3.12.2.tar.xz 1331884 SHA256 456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c SHA512 7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2 WHIRLPOOL 9655f1997ececce77f1b179f89798b5b9363ea94e0f2024772575ca05d88dd3b15432c1e0d69095b020726bc0fab1df023dfd6cc975488360f90e43fd9069a8c
DIST gcr-3.14.0.tar.xz 1340764 SHA256 2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d SHA512 2538b2575c0d325587f8b5423ac6f9c522a69b415977398dc5c4330ce1de896c966e541eb6e536e87e81013bb2dedea4d0ae8baabdab9318db5b97e0977671b8 WHIRLPOOL 755842ad30608162bb81ed58a027a26be6d12ecb12e037b826841612c2481ea564f727e2bc4e03f13f8100257b2d2ee3dae213b56b5f04319718ff30c5eee2a9
DIST gcr-3.16.0.tar.xz 1335348 SHA256 ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075 SHA512 1db6e2532d2d0ceb6f339551b009baae5815fcf8a12b76b0eb9e13f301d1205c2e2c9b8f555ae011a84521e55fe9cccb703c3dd539d638b476e0474c34672be4 WHIRLPOOL 88a0d5936b6dd54923fd476f3af0acac9c068268416cb30c65670ae8bf8bec3940cdee84e72e6218c3cf9e59a023508e5961357b2e80a297428e573cddc6bd7b
DIST gcr-3.18.0.tar.xz 1311368 SHA256 d4d16da5af55148a694055835ccd07ad34daf0ad03bdad929bf7cad15637ce00 SHA512 3733a462c23b0cf1d3579ea4b0b6eea9b5e3eb98e81e7c0e0364e540ec60a7a7bc567d1d159c674df280fb20c305cbaef796dffef73801ece4f4474352786e6b WHIRLPOOL 1bb299e386415c86dbb4f6afb48e365fd69e12a13e7349cefcd05c2685841fb0fb76c499780c2e275114c185a67b6be66989c6f989794ebbf1fd18ca501ed4b6

@ -4,30 +4,30 @@
EAPI="5"
GCONF_DEBUG="no"
VALA_MIN_API_VERSION="0.20"
VALA_USE_DEPEND="vapigen"
PYTHON_COMPAT=( python2_7 )
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit gnome2 python-any-r1 vala virtualx
DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
HOMEPAGE="https://developer.gnome.org/gcr/"
HOMEPAGE="https://git.gnome.org/browse/gcr"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0/1" # subslot = suffix of libgcr-3
IUSE="debug gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-crypt/gnupg-2
>=app-crypt/p11-kit-0.19
>=dev-libs/glib-2.34:2
>=dev-libs/glib-2.38:2
>=dev-libs/libgcrypt-1.2.2:0=
>=dev-libs/libtasn1-1:=
>=sys-apps/dbus-1
gtk? ( >=x11-libs/gtk+-3:3[X,introspection?] )
introspection? ( >=dev-libs/gobject-introspection-1.34 )
gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
introspection? ( >=dev-libs/gobject-introspection-1.34:= )
"
RDEPEND="${COMMON_DEPEND}
!<gnome-base/gnome-keyring-3.3
@ -37,6 +37,7 @@ DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
dev-libs/gobject-introspection-common
dev-libs/libxslt
dev-libs/vala-common
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35
@ -46,6 +47,7 @@ DEPEND="${COMMON_DEPEND}
"
# eautoreconf needs:
# dev-libs/gobject-introspection-common
# dev-libs/vala-common
pkg_setup() {
python-any-r1_pkg_setup

@ -1,2 +1,2 @@
DIST seahorse-3.14.1.tar.xz 1504128 SHA256 092a890982fa594da8a384f156b961392f69ce5d9518a9801035e6deb1f05e93 SHA512 1147ea601c1cb17dd1606d02f86261b0381dfdab14329fee7d68bd635420fec98174b2509b09c68216918bd9ca31f22ea538fa34cae1a8e0f4c44714b9693c0f WHIRLPOOL 208c841a28b8c7c0916c02e1a68eaa7c74681c5a3b8e0be30f65a4da953cefd9bb94d57373640513b68de9b204e9d1fc65429bf5dca0344336390068fe4a47e1
DIST seahorse-3.16.0.tar.xz 1496188 SHA256 770a5f03b8745054ef04cef9923dd713b1fbf309169150bc8dd32d7e5f7ee131 SHA512 54e020e907c0053762bf78fd1b4a47ed30d253a89d9063f6daa33598fc3cd97dca0af0cd66bb4a140223b6ae18db88a52bfc50f46987cb3a8d0351c115fba923 WHIRLPOOL 5e3c3ee17be55849c22019c7a9669380ae101e39d9c81e66d6140d500ef3882c2019f39491bfb37a9019c3fda78304aab9743dc3ae112646a4e9106493704372
DIST seahorse-3.18.0.tar.xz 1555384 SHA256 530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667 SHA512 76475645d1f94a99bf12c3bbbd840526ab3f1da9c6dd7c8c7fca1cca1cdb22692c44d6107ed1f0192dacb6990c1bbc5c1e0bb9a412132fbf18b302d6059cb254 WHIRLPOOL a470024c7c187f854f7458de31ce8aae6f27ff99ee44d872c2298983391e3f39a2c22e5c201927a5b303ced1a614de9729af9625b59714b6cd580890714e5b79

@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="debug ldap zeroconf"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
COMMON_DEPEND="
>=app-crypt/gcr-3.11.91:=
@ -25,15 +25,16 @@ COMMON_DEPEND="
net-misc/openssh
>=app-crypt/gpgme-1
>=app-crypt/gnupg-1.4
<app-crypt/gnupg-2.1
>=app-crypt/gnupg-2.0.12
ldap? ( net-nds/openldap:= )
zeroconf? ( >=net-dns/avahi-0.6:= )
"
DEPEND="${COMMON_DEPEND}
app-text/yelp-tools
dev-util/gdbus-codegen
>=dev-util/intltool-0.35
dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
"
@ -62,6 +63,5 @@ src_configure() {
$(use_enable debug) \
$(use_enable ldap) \
$(use_enable zeroconf sharing) \
ITSTOOL=$(type -P true) \
VALAC=$(type -P true)
}

@ -1,2 +1,2 @@
DIST gnome-dictionary-3.14.2.tar.xz 827932 SHA256 2f2a0293c5de83f624cead84d7bb3f93d30a30554640926bb2db9c4944840f82 SHA512 4042207acf9d17dad0736b16811584b42f5c3fb9219e1bf591292c67c5a4272f4238b0ec178adc40b4dd02313ba0ff3b751b65ae64e8d73c67f90dd8079fb68b WHIRLPOOL e50878b529e6827047ed5daf30157218907b6ff69383d1183df257a8bfdc39fd14e81b2199899b36ff97a0a1d08716834d2496d8111d4a0aface5c93b4266c89
DIST gnome-dictionary-3.16.2.tar.xz 847024 SHA256 a2981a76ecf57a5e5f1ebc88697f228a40e550c3371535aa15cc959fe51badd5 SHA512 f6c50a8d10e360320ac2ed34a56723f9e7eb72f81f27d40bc69a63eab23cad31e7ff45fb6712ff14b84b3ec2f82ae35bfab0ddde7980766b77d1416be67f384a WHIRLPOOL 6fe96815b79e1d217377ca61d74e2a61ab67a89057e3131cbbbb24b6c43fc908298cab4b34d3ab1c0700859deb18b7ed45d4870261fd0009118f168535157365
DIST gnome-dictionary-3.18.0.tar.xz 852072 SHA256 5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead SHA512 ea276880329422e08923cc9346821bfd7c9bc1b71c09c6521a28f01a6bee34ec4be3b7f503ed8d37916a9b6351074ffd6d4333fed46d7c820198ebf0e62f5eb4 WHIRLPOOL 1c70faa84b96ddebafc2297ed6ea08ea3cec62a76340d5dc0800c2176603dec187b33f1a406538b832907196356f4015cf3c029868447998ef8e22f6f7cb0aef

@ -4,23 +4,23 @@
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
inherit gnome2
DESCRIPTION="Dictionary utility for GNOME"
HOMEPAGE="https://live.gnome.org/GnomeUtils"
HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="0/6" # subslot = suffix of libgdict-1.0.so
IUSE="ipv6"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
SLOT="0/9" # subslot = suffix of libgdict-1.0.so
IUSE="+introspection ipv6"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.39:2
>=dev-libs/glib-2.39:2[dbus]
x11-libs/cairo:=
>=x11-libs/gtk+-3:3
>=x11-libs/gtk+-3.14:3
x11-libs/pango
introspection? ( >=dev-libs/gobject-introspection-1.42:= )
"
RDEPEND="${COMMON_DEPEND}
gnome-base/gsettings-desktop-schemas
@ -30,12 +30,13 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.15
>=dev-util/intltool-0.40
dev-util/itstool
>=sys-devel/gettext-0.17
virtual/pkgconfig
"
src_configure() {
gnome2_src_configure \
$(use_enable ipv6) \
ITSTOOL=$(type -P true)
$(use_enable introspection) \
$(use_enable ipv6)
}

@ -1,4 +1,4 @@
DIST pms-5-prebuilt.tar.xz 540244 SHA256 c93ce6902db323ab7ec613ad90a6dca2beda2dd2cebcc3e8ace83c1faeb6a1c7 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451 WHIRLPOOL 9369c7604fdf0aadb7666f1fc08f041b064896d6359dd76779dc3af842fef14d81aed07301ec52eac11462664d16faed0e3fd50a0b96702822c59538917f5f78
DIST pms-5.tar.xz 50284 SHA256 a3b7702298adc4481584ed03f2d49e9fa7ea58638d8e8e9bf36fca832b2fbc87 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e WHIRLPOOL 373d333f1c060faacbfbd398ae3be3a0143c0ee618b093867313e4182bce7f15609445d2fc6b109f6f02fe597fe8f6cf687673029569e27fa7ed3411f4932013
DIST pms-6-prebuilt.tar.xz 535248 SHA256 dc9a30ca6a970a73ac3b6db54ee480f192f5fa43655bdace6021001310578208 SHA512 2d592a7547449f9f25ab5860fc7b4ff5cb7f786230f898a4ec51151e1e3db1f3297b354fe04bba8e43fa83ac3e33858a7659d7b1ab936df2655b650756801ba1 WHIRLPOOL 5e68f4d9404c8527143b3067a2b781c2890476f42dd87139fd97246fa1347e7039e91f3b1ecc4fdade8338172f7bec42bef080658874f33e3aa84218a3cbecbf
DIST pms-6.tar.xz 53508 SHA256 4c4bfa5fabdb8664762687c77679ba9df156ec95b5b62e8aefb943131f51fca3 SHA512 87f90fa9b759b2a230f4a3d7de7b473712c9bc98950e061a50ef2155ab2e52147b323327cf5583e1de5c22d56cf755f1bded68748a5c89427b372be1083197e5 WHIRLPOOL 5a8a530baee368b027795eda8157f0dbaeb90b0e43825be3d861d89ba4b93f965a63ca6959908f4b168420d3049669ac809a4bf5dc764867b2c1515891c843ca
DIST pms-6_p20151113-prebuilt.tar.xz 536876 SHA256 c9bd8e6cd5cc29031327202ebf645843a1055651b9719faab3e14ecb0c1dd246 SHA512 1ea7fe4ccd235921c75bfae267834005b50994cf76a43a0ae40e4d044179e375fd99fe4ddd7f03f9aeef3bb8cd7e3a02cf6f5cccb78a2daa3a3a02a428c60131 WHIRLPOOL 8297dbf280a66f1532ccd4632018efae5c7802f22c7024b4a0b7185641b4d97ac790303f86fd66fa91868c8f3071935d757568afd5e74cc36c80c22cf65f6fec
DIST pms-6_p20151113.tar.xz 53784 SHA256 2099b3c698acd38d2188afff8bb0c19817d5b9f5d98c6d1e3c746df12111a75f SHA512 92af8c06c9b278a468de74c2686285b9b9a5d0234537aa9371ac99875ec15238edf41f8d86ee058ed8c471ecffa9f033993eb07921fe1bd034d838717f70b7ef WHIRLPOOL 1276df9dd735d3558e4605ba7cc4ef7997f53b1d5cc73debd24cef9192f588039975e3cdae3d6877d7a882441f0a47c8797d85670794efcdfc1f2bdbd70d7e0b

@ -1,2 +1,2 @@
DIST gedit-plugins-3.14.1.tar.xz 1291776 SHA256 d0f4b8282e91dc3f77698aa4c8a6bd09df057b4df77fb86594c402fe7347b881 SHA512 bc385cae81d3b2c4faa26cb94612fbea0e503e556031594b72f3f176ad8846c42baa7bdfafffb85b226d9faf836237da56b91de593f41037ff8940307bc1c302 WHIRLPOOL d191a59c33a985144bb3264385f8c827e886c3183686df1f2d27a3db4b73bd22710463558bbefed45879ef27cdf1597efee6a86d69c8bc78b9fa92a11628b7cb
DIST gedit-plugins-3.16.0.tar.xz 1280064 SHA256 b685b84ada8ca04f6aa201e402a0208591be4a37b874595a0a85d0a14b52f191 SHA512 336d57bf9a25bb70cf63bb4ea6e81215381e91a04126429fd4f930596ed1731ceb8ed36b091757fb6729ba032bd8af083a3ec056a2e91f7abddc505282e511e2 WHIRLPOOL a5ef32695c8b7bbe0fd19a53496d7390d306e9587a0228cfb0151ff59eb0d127ba85e7c481403fb6fb3aaf14fb95428c6b60d5b65cafcecab230edc2733bc918
DIST gedit-plugins-3.18.0.tar.xz 1366868 SHA256 e25249c0c2a057827bb4d4755a2359e1f9b4de288e0c4e201c6ef4f0e0e8c580 SHA512 8ce705c3263492c699f2504c178f81760e0d3d153dff0bdadbf39c240d77951e887534f586a3b340904dc11c9bf55424861dd43395a3ae8eadfa5752a4d168ca WHIRLPOOL de69a801e7b68ca42a2b2dd588452ba8a3e62bf39199e4662a10c4d557173f4ec8b7f145f1530de7a607740bf3c06ddd942af85e0d27a3fc7e4b013433a1e9e0

@ -5,19 +5,20 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python3_{3,4} )
PYTHON_COMPAT=( python3_{3,4,5} )
PYTHON_REQ_USE="xml"
VALA_MIN_API_VERSION="0.28"
inherit eutils gnome2 multilib python-r1
inherit eutils gnome2 multilib python-r1 vala
DESCRIPTION="Official plugins for gedit"
HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
LICENSE="GPL-2+"
KEYWORDS="amd64 x86"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE_plugins="charmap git terminal zeitgeist"
IUSE_plugins="charmap git terminal vala zeitgeist"
IUSE="+python ${IUSE_plugins}"
# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
REQUIRED_USE="
@ -29,14 +30,14 @@ REQUIRED_USE="
"
RDEPEND="
>=app-editors/gedit-3.14[python?]
>=app-editors/gedit-3.16[python?]
>=dev-libs/glib-2.32:2
>=dev-libs/libpeas-1.7.0[gtk,python?]
>=x11-libs/gtk+-3.9:3
>=x11-libs/gtksourceview-3.14:3.0
>=x11-libs/gtksourceview-3.17.3:3.0
python? (
${PYTHON_DEPS}
>=app-editors/gedit-3.14[introspection,${PYTHON_USEDEP}]
>=app-editors/gedit-3.16[introspection,${PYTHON_USEDEP}]
dev-libs/libpeas[${PYTHON_USEDEP}]
>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
@ -49,10 +50,12 @@ RDEPEND="
charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
git? ( >=dev-libs/libgit2-glib-0.0.6 )
terminal? ( x11-libs/vte:2.91[introspection] )
vala? ( $(vala_depend) )
zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12[introspection] )
"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40.0
dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
"
@ -61,10 +64,16 @@ pkg_setup() {
use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
}
src_prepare() {
use vala && vala_src_prepare
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
$(use_enable python) \
ITSTOOL=$(type -P true)
$(use_enable vala) \
$(use_enable zeitgeist)
}
src_install() {
@ -80,7 +89,6 @@ src_install() {
clean_plugin charmap
clean_plugin git
clean_plugin terminal
clean_plugin zeitgeist
}
clean_plugin() {

@ -1,2 +1,2 @@
DIST gedit-3.16.3.tar.xz 2924392 SHA256 c28df44a29ee5707441f89e94b513079d709111afec4bd4b079a1dff0242cdb2 SHA512 479370c25be4b8c6f2fc77628e835b763194fdc9ce1858bb8fe4641964e6911db573b28300d8cc5519a5e4ddef980d28c224a315c3879770265be9328b70e925 WHIRLPOOL 604690b148f2af10358c1d567521e49a406594c390d8b67a22a4879ce1d70398d0de43865cc3874d29b51d9c86103fa765b5cde181008172e5617333b1ab3b9e
DIST gedit-3.16.4.tar.xz 2925984 SHA256 210937ea9143d8a6c9580a7ab11acf60d478f516d591ace6c8384fb085fb4cc0 SHA512 6320e11f6387b317789f6af4bdbb54350af89bd00c1443b26e68afdacf87c672ca74caf50c9ead80f4395a826d07a8da640e5d5ae89f71bccf75da683f420a81 WHIRLPOOL 057a7ecf22d12fa4899d20e3e365000bfe5c39873edc1331a75c1a061a5ce601b69d5ffaec1685cf0751ab0d7feff68e4d8be024654afdf90a6c08d0193aa2e9
DIST gedit-3.18.2.tar.xz 2915772 SHA256 856e451aec29ee45980011de57cadfe89c3cbc53968f6cc865f8efe0bd0d49b1 SHA512 e81382b74749c4592565bab25d47784a3206e033e6b0e5d5a557403590dafd130e41b31bcecc820a3d9823a48f8e94907bc9bb0335121e369abaca1360a95b30 WHIRLPOOL 87b40323caa707a4ce68d5efc299075883a1fc01e1def15f9052802bccae9075c3aa8c50d36062bb96060421008c510d3c0600fd359950a06ae651e3b56553e5

@ -5,7 +5,7 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python3_{3,4} )
PYTHON_COMPAT=( python3_{3,4,5} )
VALA_MIN_API_VERSION="0.26"
VALA_USE_DEPEND="vapigen"
@ -25,15 +25,15 @@ REQUIRED_USE="
python? ( ^^ ( $(python_gen_useflags '*') ) )
"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
# X libs are not needed for OSX (aqua)
COMMON_DEPEND="
>=dev-libs/libxml2-2.5.0:2
>=dev-libs/glib-2.40:2[dbus]
>=dev-libs/glib-2.44:2[dbus]
>=x11-libs/gtk+-3.16:3[introspection?]
>=x11-libs/gtksourceview-3.16:3.0[introspection?]
>=dev-libs/libpeas-1.7.0[gtk]
>=x11-libs/gtksourceview-3.17.3:3.0[introspection?]
>=dev-libs/libpeas-1.14.1[gtk]
gnome-base/gsettings-desktop-schemas
gnome-base/gvfs
@ -59,6 +59,7 @@ DEPEND="${COMMON_DEPEND}
${vala_depend}
app-text/docbook-xml-dtd:4.1.2
>=app-text/scrollkeeper-0.3.11
app-text/yelp-tools
dev-libs/libxml2:2
>=dev-util/gtk-doc-am-1
>=dev-util/intltool-0.50.1
@ -78,7 +79,7 @@ src_prepare() {
}
src_configure() {
DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
gnome2_src_configure \
--disable-deprecations \

@ -1 +1,2 @@
DIST ghex-3.10.1.tar.xz 1424308 SHA256 34b66cb5c84410c420df72f229d25aee5979e58048a246ed719b046f0c241132 SHA512 bfb7f4af1c36698571ea176fd4bbba2ea11a337a8e02976da6b784bd5cc634a4b853e36918ebaeea382d680e796343838ce4709ac720da86755628894043c28c WHIRLPOOL f63bbd4256d4e6e3134e4f58a2b1667d3536aea62605f5762f0ed04191e192e986663c53c7537996553325003dec38f4419b1d9a84465f958e0f5f76cec6fe1e
DIST ghex-3.18.0.tar.xz 1569372 SHA256 c5b1eb50a8dd1334880b37617871498b778ea137f79bb43894ec68e4f63dc925 SHA512 41e05b649749b9523492794223357789e2b66192f96c45da34d91eff157e52b6d98898ce4f469d6c741ea3c79b0aa35f2e7ebc08527d5831f30bd0ee8b521c1e WHIRLPOOL 2fb54180162d94ee54f6cbcf8df2d195681e88193c2f3455dd7f380753be54c721038308c9c02a5bb19251ddf2ddbbf33a71561cc3175546c155ef33ea099a4d

@ -0,0 +1,28 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="GNOME hexadecimal editor"
HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="2"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
>=dev-libs/atk-1
>=dev-libs/glib-2.31.10:2
>=x11-libs/gtk+-3.3.8:3
"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.41.1
>=sys-devel/gettext-0.17
app-text/yelp-tools
virtual/pkgconfig
"

@ -1,3 +1,2 @@
DIST latexila-3.14.4.tar.xz 1139644 SHA256 8e087040260a6eb777382c55fd3d1260f1686453052ccdf1a5b9e0e4178c4d62 SHA512 88b3f2c8d931e49370614021f69e0711b3e78b1e49ad99601ea70f570c551b4f89558fdc3f5abaf68adba4e819a542ba3159c830b134c7e9679fbeffe8f3934d WHIRLPOOL 2d2925470e2fd27fa79b553ec8e1e9442c7817df36a907c47ace3b6b33d58977ae571aec6cc3f787e6de98c679f355592add59e3bf2e04d7090d75d8aae17068
DIST latexila-3.16.1.tar.xz 1059308 SHA256 ab2d769546e10c86670e86271024c023c0a87f1b72856955c1883416a9f333f0 SHA512 b6854a301006c04c6f87cc3e9d5fc167ac7b3e0c7ac11fdce3dd6a0dca74d69b3ec51130feb8a8af505b50f6f85cb0684f7102bf5cc976fe1f845dd604863314 WHIRLPOOL 30ce694b1ddb5d71932679d31fb890aca0afc71634d6cdf744faddd792f47589c7593c43b6476b932002d70f74f4c738cef38f38fc6caa0452b1e13b205c57cc
DIST latexila-3.16.2.tar.xz 1058776 SHA256 5ad20a2acdb8c93dea5aa175a219e62efe5f4a7ffb67bc52ff6faf0c6f42bad3 SHA512 d9d5c90374d5aa9b2599f90565dde9da1c4dc7713b7be8ffbfac71b5797124142ef46811660f14edfd278ec9d3f3b6b0c56ef325201fb85caf3b7322577e40fc WHIRLPOOL 3fde6abc4979dd9a40cc019e30c8b0e0c55c97fa3a4670d073d1ca6f662342b54923ea263246a169e8944fa3aaba358d6881629e20c6e949b1287e9328c1cdc6
DIST latexila-3.18.1.tar.xz 1092768 SHA256 edfd95f321dfff31fb094c243c358cb78d19904164b9ef4fb37c021113044d0a SHA512 4123cbe4b6df7b493767abbe75ed43e025b640a869a61abec29715f40a3619433bc8300be6a06c8ec5c252215a6b05623d4b7a7f55d7eabbafa6f0ca19a26f92 WHIRLPOOL e1612ba477bef16aaee9f2173f29963c7dab3c0496082fe308ee2bed22b1a6cf9b480f1df1d259a774b593f3c58976de6bc0c3d6757941254abb1a5de067ddb6

@ -1,48 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
VALA_MIN_API_VERSION="0.26"
inherit gnome2 vala
DESCRIPTION="Integrated LaTeX environment for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="+latexmk rubber"
COMMON_DEPEND="
app-text/enchant
>=app-text/gtkspell-3.0.4:3
>=dev-libs/glib-2.40:2[dbus]
>=dev-libs/libgee-0.10:0.8=
gnome-base/gsettings-desktop-schemas
>=x11-libs/gtk+-3.14:3
>=x11-libs/gtksourceview-3.14.3:3.0
x11-libs/gdk-pixbuf:2
x11-libs/libX11
x11-libs/pango
$(vala_depend)
"
RDEPEND="${COMMON_DEPEND}
virtual/latex-base
x11-themes/hicolor-icon-theme
latexmk? ( dev-tex/latexmk )
rubber? ( dev-tex/rubber )
"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50.1
dev-util/itstool
virtual/pkgconfig
"
src_prepare() {
DOCS="AUTHORS HACKING NEWS README"
gnome2_src_prepare
vala_src_prepare
}

@ -19,12 +19,12 @@ IUSE="+introspection +latexmk rubber"
COMMON_DEPEND="$(vala_depend)
app-text/enchant
>=app-text/gtkspell-3.0.4:3
>=app-text/gspell-0.1
>=dev-libs/glib-2.40:2[dbus]
>=dev-libs/libgee-0.10:0.8=
gnome-base/gsettings-desktop-schemas
>=x11-libs/gtk+-3.14:3
>=x11-libs/gtksourceview-3.16:3.0
>=x11-libs/gtksourceview-3.18:3.0
x11-libs/gdk-pixbuf:2
x11-libs/libX11
x11-libs/pango

@ -35,6 +35,8 @@ DIST wine-1.7.46.tar.bz2 22356320 SHA256 9ab4046cc676de3054f9f2560e7d757b25324f7
DIST wine-1.7.47.tar.bz2 22398577 SHA256 ba74f75aec400dc4b1d64ddc29560e4946837e73cb19d9c231604ff0147bbb2e SHA512 588bc143fc371c013b3565044ac14a22176c63fb79e7798a32cd75ec2dbf6b52a73529638254809aa3a4b3105067e96289b555436099c41622b8ffeb2b97a601 WHIRLPOOL 6545baa254f181fbe7a35b19e319faf7b21b838b91fddcab46ae65d8331407d62b36f78f20a19f97895c5c16059f18b3d23d6659658f8939611b171a408478ef
DIST wine-1.7.50.tar.bz2 22586575 SHA256 7c5410fab820281f337d478c18305027363c9012f30f742339ef1eb0f9dd711e SHA512 b79f0391ef147a9ac8f60079e9068435a25552ad2e133b7d84443978f3b0034c17d8e6edee717fbdbc117021ebe22892957923edbba5e8528d6abb21116b9006 WHIRLPOOL 7a4502b088f259153904a80bc8aa81ebe5cb1e27fc4905b8a0fa84beb2e7904b382473a46d472a9b8a11845ab2eda42965f64bead5379995112c6e5f335c756c
DIST wine-1.7.51.tar.bz2 22639053 SHA256 397fc95b463d6ae1b65ab0477d9fe5d0871e8e2a3322bc9d984e438f2c4d0f52 SHA512 d23b2a37f82c26b4a2b339711a9eb6d6819c8c4def27c65cb7b8bb917aa660f51b3190b35493246d0bc2eea1ffd47529c4ed18a75ee64654b5f40970eefe277a WHIRLPOOL ec4aec57c1623cf1c5bd91f654cff4a23f5ec4010c33217d2e46f25f6322aa8707797368b428561fee6252849bf09abb25e01524d0ff41ebf440ca7914dd9464
DIST wine-1.7.52.tar.bz2 22707539 SHA256 0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b SHA512 834a77553d1352840c747ab5dc3e582b15da4ea65f16f9d58d0cc8afb460b4a0fded859929331dd32d9f4f66ab14bb890cf239d0a283bf9ffd92b48f9d1687de WHIRLPOOL 7e6cc679d994449e7f822c2593d1e8cc87d439df6084ad7d48897f3829b866219a0674e81e1fecdc5629225cd3c6ca2735212e1a0cb9d41a236af4674b62d077
DIST wine-1.7.53.tar.bz2 22763993 SHA256 efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3 SHA512 82c53c5a7913f5c3ab38239f6cd4dc5ec16db878b8ff9ff46162f11f72c13a3da9c1dc80e7eddef5eb2b909e7b8cd771294cfdc79d734d643aecfeefb0059401 WHIRLPOOL 054640d64794e0eac3b41c359353a8d322f9ae9a9a01969616fe6f9207d4276909d4fa17c7a2b167d705166490df523b3dcaf738efab0a71bfab26ea59eeafe1
DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
@ -66,6 +68,8 @@ DIST wine-staging-1.7.46.tar.gz 9204220 SHA256 a3b681f38917889bc6dce3ea3e78e91da
DIST wine-staging-1.7.47.tar.gz 9166592 SHA256 75aef17c68d1e54b922529832edadca5951e6a37637aad696cfe5abb93d9ca15 SHA512 b3feb61040a727b50fc3efb08441a800b08b4f7d61a00fc68175a6187486a701cc4737f9543119c32ed0c5f141d73ace396114337082cf7978a3437f4217844a WHIRLPOOL 69bead0fa0748dab8d0480d20052b3a75798d42bc32d55b9b254fba7774dddda48642c4e2f116f2c3d813f97e0827232945b3adaad22a827a43be8de12698bbc
DIST wine-staging-1.7.50.tar.gz 9239831 SHA256 04803fe71edc5d5149624946ffd89de1ddadcd151a47e25cd7e0290b31c1f395 SHA512 7866762cd9ddeeba48167c44df0d186e238f61ffb1412315b3ec466b2a99a01c1cb55816998218aba8a14294302c7d98874144f5f456e341bf506b2b09da0d28 WHIRLPOOL f01192fed42532639afb6b5f4905ec77aeb105a4c33000ec624e87aa792ad4194253d793461a2e5d18051d1b0c2a7438e5745447fa616d34759a12dec3cc80bb
DIST wine-staging-1.7.51.tar.gz 9628831 SHA256 662cbfcca95405045ba063f312fa4f605d8c48b7b0930c951e2ebac817f3b763 SHA512 f9d2388d63af3aa6ccdc7b66f9d767c19c1577acb84eb3ac03f9b4e07b3ff76906875998fdb42baae3768202129d270b1a1b15fd6bfb20fa33e3bc70559bdf45 WHIRLPOOL f606b6cb2f9a2ece0ce411423df8db1a95217341c2dc6720f748ba8df71758e0a099afc7679fc37fb6621ba1f2fcd5bb505a85cdde797adb45d093836e001441
DIST wine-staging-1.7.52.tar.gz 9654310 SHA256 84354a10e4226b5e456abb6d5727f4514c79d537ca809bb114a945830166cd73 SHA512 1c6c76ff67363dc3b1b9c92b10df3cdd3e5deb4c4223128478b891557ffafdcb5db2752ed26e23e8c2bc7176e5c9d22a3990b148aff6fbb5211a7527b9a542f1 WHIRLPOOL 24f2bf5b357a474de7efe95cbad13bc3126f55fe0610aa1d9c258af605a002eabfd860b2874e5a2c4d2f017e3f7238107001b57ba1c406066a450bc34937e9ed
DIST wine-staging-1.7.53.tar.gz 9638222 SHA256 438f41165987a57635694dba2f67cc435cd630581b13cafe0c85daacf37a102a SHA512 716840c44923848a28b481f6b4e422ef84fe33bef33a650c183c62be0dbec34471375fe2b1911382282f293fd5135ce133cdb775acd7df98029be2e4646b6d9e WHIRLPOOL 702555a706e50521ca6864b7b29ee4a4774fc8d770775c5186728b19e2c71ba6040ce98f86a772435c0d2f0a4363bc2a1e8f0b13ffbbe9395c072d3d89d1118c
DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487

@ -0,0 +1,445 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
AUTOTOOLS_AUTORECONF=1
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
#KEYWORDS=""
else
MY_P="${PN}-${PV/_/-}"
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
S=${WORKDIR}/${MY_P}
fi
GV="2.40"
MV="4.5.6"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
GST_P="wine-1.7.34-gstreamer-v5"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
gecko? (
abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
mono? ( abi_x86_32 )
pipelight? ( staging )
s3tc? ( staging )
vaapi? ( staging )
?? ( gstreamer staging )
osmesa? ( opengl )" #286560
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
COMMON_DEPEND="
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
capi? ( net-dialup/capi4k-utils )
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
)
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
)
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
)
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
)
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
abi_x86_32? (
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-baselibs-20140508-r14
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-db-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-medialibs-20140508-r6
!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-opengl-20140508-r1
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-sdl-20140508-r1
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-soundlibs-20140508
!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-xlibs-20140508
)"
RDEPEND="${COMMON_DEPEND}
dos? ( games-emulation/dosbox )
perl? ( dev-lang/perl dev-perl/XML-Simple )
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.0.25 )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )
pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
staging? ( dev-lang/perl dev-perl/XML-Simple )
X? (
x11-proto/inputproto
x11-proto/xextproto
x11-proto/xf86vidmodeproto
)
xinerama? ( x11-proto/xineramaproto )
prelink? ( sys-devel/prelink )
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
sys-devel/flex"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
usr/share/applications/wine-notepad.desktop
usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
einfo "Checking for gcc-5 ms_abi compiler bug ..."
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
# Run in subshell to prevent "Aborted" message
if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/549768"
eerror
return 1
fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
eerror "You need gcc-4.4+ to build 64-bit wine"
eerror
return 1
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
eerror "See https://bugs.gentoo.org/487864 for more details."
eerror
return 1
fi
}
pkg_pretend() {
wine_build_environment_check || die
}
pkg_setup() {
wine_build_environment_check || die
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-r3_src_unpack
if use staging || use pulseaudio; then
EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
unset ${PN}_LIVE_REPO;
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
fi
else
unpack ${MY_P}.tar.bz2
use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
fi
unpack "${WINE_GENTOO}.tar.bz2"
use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
ewarn "Applying experimental patch to fix GStreamer support. Note that"
ewarn "this patch has been reported to cause crashes in certain games."
# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
# during shutdown" patch and "Added patch to implement shared memory
# wineserver communication for various user32 functions" prevents the
# gstreamer patch from applying cleanly.
# So undo the staging patch, apply gstreamer, then re-apply rebased staging
# patch on top.
if use staging; then
PATCHES+=(
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
"${WORKDIR}/${GST_P}.patch"
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
else
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
fi
if use staging; then
ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
ewarn "unless you can reproduce them with USE=-staging"
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
(
set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?
elif use pulseaudio; then
PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
autotools-utils_src_prepare
# Modification of the server protocol requires regenerating the server requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
tools/make_requests || die #432348
fi
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
if ! use run-exes; then
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
fi
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
}
src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
multilib-minimal_src_configure
}
multilib_src_configure() {
local myconf=(
--sysconfdir=/etc/wine
$(use_with alsa)
$(use_with capi)
$(use_with lcms cms)
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
$(use_with gsm)
$(use_with gstreamer)
--without-hal
$(use_with jpeg)
$(use_with ldap)
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
$(use_with nls gettext)
$(use_with openal)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
$(use_with oss)
$(use_with pcap)
$(use_with png)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with v4l)
$(use_with X x)
$(use_with xcomposite)
$(use_with xinerama)
$(use_with xml)
$(use_with xml xslt)
)
if use pulseaudio || use staging; then
myconf+=( $(use_with pulseaudio pulse) )
fi
use staging && myconf+=(
--with-xattr
$(use_with vaapi va)
)
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
# set AR and RANLIB to make QA scripts happy; #483342
tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
myconf+=( --enable-win64 )
else
myconf+=( --disable-win64 )
fi
# Note: using --with-wine64 results in problems with multilib.eclass
# CC/LD hackery. We're using separate tools instead.
fi
ECONF_SOURCE=${S} \
econf "${myconf[@]}"
emake depend
}
multilib_src_test() {
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
if [[ ${ABI} == x86 ]]; then
if [[ $(id -u) == 0 ]]; then
ewarn "Skipping tests since they cannot be run under the root user."
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
return
fi
WINEPREFIX="${T}/.wine-${ABI}" \
Xemake test
fi
}
multilib_src_install_all() {
local DOCS=( ANNOUNCE AUTHORS README )
local l
add_locale_docs() {
local locale_doc="documentation/README.$1"
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
}
l10n_for_each_locale_do add_locale_docs
einstalldocs
prune_libtool_files --all
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
if use gecko ; then
insinto /usr/share/wine/gecko
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
fi
if use mono ; then
insinto /usr/share/wine/mono
doins "${DISTDIR}"/wine-mono-${MV}.msi
fi
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
dosym /usr/bin/wine{64,} # 404331
dosym /usr/bin/wine{64,}-preloader
fi
# respect LINGUAS when installing man pages, #469418
for l in de fr pl; do
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
done
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
if ! use gecko; then
ewarn "Without Wine Gecko, wine prefixes will not have a default"
ewarn "implementation of iexplore. Many older windows applications"
ewarn "rely upon the existence of an iexplore implementation, so"
ewarn "you will likely need to install an external one, like via winetricks"
fi
if ! use mono; then
ewarn "Without Wine Mono, wine prefixes will not have a default"
ewarn "implementation of .NET. Many windows applications rely upon"
ewarn "the existence of a .NET implementation, so you will likely need"
ewarn "to install an external one, like via winetricks"
fi
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}

@ -0,0 +1,445 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
AUTOTOOLS_AUTORECONF=1
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
#KEYWORDS=""
else
MY_P="${PN}-${PV/_/-}"
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
S=${WORKDIR}/${MY_P}
fi
GV="2.40"
MV="4.5.6"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
GST_P="wine-1.7.34-gstreamer-v5"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
gecko? (
abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
mono? ( abi_x86_32 )
pipelight? ( staging )
s3tc? ( staging )
vaapi? ( staging )
?? ( gstreamer staging )
osmesa? ( opengl )" #286560
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
COMMON_DEPEND="
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
capi? ( net-dialup/capi4k-utils )
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
)
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
)
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
)
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
)
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
abi_x86_32? (
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-baselibs-20140508-r14
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-db-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-medialibs-20140508-r6
!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-opengl-20140508-r1
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-sdl-20140508-r1
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-soundlibs-20140508
!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-xlibs-20140508
)"
RDEPEND="${COMMON_DEPEND}
dos? ( games-emulation/dosbox )
perl? ( dev-lang/perl dev-perl/XML-Simple )
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.0.25 )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )
pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
staging? ( dev-lang/perl dev-perl/XML-Simple )
X? (
x11-proto/inputproto
x11-proto/xextproto
x11-proto/xf86vidmodeproto
)
xinerama? ( x11-proto/xineramaproto )
prelink? ( sys-devel/prelink )
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
sys-devel/flex"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
usr/share/applications/wine-notepad.desktop
usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# bug #549768
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
einfo "Checking for gcc-5 ms_abi compiler bug ..."
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
# Run in subshell to prevent "Aborted" message
if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/549768"
eerror
return 1
fi
fi
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
eerror "You need gcc-4.4+ to build 64-bit wine"
eerror
return 1
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
eerror "See https://bugs.gentoo.org/487864 for more details."
eerror
return 1
fi
}
pkg_pretend() {
wine_build_environment_check || die
}
pkg_setup() {
wine_build_environment_check || die
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-r3_src_unpack
if use staging || use pulseaudio; then
EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
unset ${PN}_LIVE_REPO;
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
fi
else
unpack ${MY_P}.tar.bz2
use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
fi
unpack "${WINE_GENTOO}.tar.bz2"
use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
ewarn "Applying experimental patch to fix GStreamer support. Note that"
ewarn "this patch has been reported to cause crashes in certain games."
# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
# during shutdown" patch and "Added patch to implement shared memory
# wineserver communication for various user32 functions" prevents the
# gstreamer patch from applying cleanly.
# So undo the staging patch, apply gstreamer, then re-apply rebased staging
# patch on top.
if use staging; then
PATCHES+=(
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
"${WORKDIR}/${GST_P}.patch"
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
else
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
fi
if use staging; then
ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
ewarn "unless you can reproduce them with USE=-staging"
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
(
set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?
elif use pulseaudio; then
PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
autotools-utils_src_prepare
# Modification of the server protocol requires regenerating the server requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
tools/make_requests || die #432348
fi
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
if ! use run-exes; then
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
fi
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
}
src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
multilib-minimal_src_configure
}
multilib_src_configure() {
local myconf=(
--sysconfdir=/etc/wine
$(use_with alsa)
$(use_with capi)
$(use_with lcms cms)
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
$(use_with gsm)
$(use_with gstreamer)
--without-hal
$(use_with jpeg)
$(use_with ldap)
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
$(use_with nls gettext)
$(use_with openal)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
$(use_with oss)
$(use_with pcap)
$(use_with png)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with v4l)
$(use_with X x)
$(use_with xcomposite)
$(use_with xinerama)
$(use_with xml)
$(use_with xml xslt)
)
if use pulseaudio || use staging; then
myconf+=( $(use_with pulseaudio pulse) )
fi
use staging && myconf+=(
--with-xattr
$(use_with vaapi va)
)
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
# set AR and RANLIB to make QA scripts happy; #483342
tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
myconf+=( --enable-win64 )
else
myconf+=( --disable-win64 )
fi
# Note: using --with-wine64 results in problems with multilib.eclass
# CC/LD hackery. We're using separate tools instead.
fi
ECONF_SOURCE=${S} \
econf "${myconf[@]}"
emake depend
}
multilib_src_test() {
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
if [[ ${ABI} == x86 ]]; then
if [[ $(id -u) == 0 ]]; then
ewarn "Skipping tests since they cannot be run under the root user."
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
return
fi
WINEPREFIX="${T}/.wine-${ABI}" \
Xemake test
fi
}
multilib_src_install_all() {
local DOCS=( ANNOUNCE AUTHORS README )
local l
add_locale_docs() {
local locale_doc="documentation/README.$1"
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
}
l10n_for_each_locale_do add_locale_docs
einstalldocs
prune_libtool_files --all
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
if use gecko ; then
insinto /usr/share/wine/gecko
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
fi
if use mono ; then
insinto /usr/share/wine/mono
doins "${DISTDIR}"/wine-mono-${MV}.msi
fi
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
dosym /usr/bin/wine{64,} # 404331
dosym /usr/bin/wine{64,}-preloader
fi
# respect LINGUAS when installing man pages, #469418
for l in de fr pl; do
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
done
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
if ! use gecko; then
ewarn "Without Wine Gecko, wine prefixes will not have a default"
ewarn "implementation of iexplore. Many older windows applications"
ewarn "rely upon the existence of an iexplore implementation, so"
ewarn "you will likely need to install an external one, like via winetricks"
fi
if ! use mono; then
ewarn "Without Wine Mono, wine prefixes will not have a default"
ewarn "implementation of .NET. Many windows applications rely upon"
ewarn "the existence of a .NET implementation, so you will likely need"
ewarn "to install an external one, like via winetricks"
fi
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}

@ -1,2 +1,2 @@
DIST winetricks-20150826.tar.gz 172065 SHA256 9b7401aebe61656f0a75ab04261a1531967d93b762b650a98af5928961e98ab0 SHA512 e1d2746a10fb2e0891ab59c0bf496c2499eb0614ae30a68aff138badf661ed97da8e689d4ed1c42d4db4e673d5f5cb5e81d0399ab155c1a8c75369e5997d6d45 WHIRLPOOL b7dbb519466a0fedb173c827c4a8d49b12aabbcb37d40ade80f97db29bba215f22691cada71c787f2ce8afc440c3cdcd03ed88e15718eaae52459d92d4c547ec
DIST winetricks-20151110.tar.gz 174736 SHA256 788662ddf6177893db3c1ced11be91982ceaf1d714fef94bc1e966c812420782 SHA512 ba77b055c956c03cb36c0eb47430f1273ce2e8a11e8f80cd3e5968bc2abfc1de9a6d5498f6e4253b538a315b7aa7fa138d1d92f561aad52794fbe6b04d20ad61 WHIRLPOOL 78db58e5bd7873e75c8a76636351d993f9d47d8144a6ff657136972774e9d0d52382c1ebe113ba643a9e204bec03a29efa275b719c817f4f9e9c16aaa2f8e961
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b

@ -1,4 +1,3 @@
DIST geoclue-0.12.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
DIST geoclue-2.1.10.tar.xz 334916 SHA256 f1d7e7a9c60633d3d747f55fee848299114b3222a4d65e955c2cbcd297d01c68 SHA512 c0efc76dd368a29033591486de419079b72089edea2de52336e6618a01feedf211cdcb1eb804a80ff43e8495951d1bba9a10b43c8bbec310706c5fb8d3ca30ac WHIRLPOOL f9d53465dd0bc74b95402ab39c7eace4c5820cffd6890e17ad9a082dbd18694ac6f1d61ca5ca4a55c2f6cc3b2b4154dded37efc05806c9cf73d91bbb51cf9cd8
DIST geoclue-2.1.9.tar.xz 331532 SHA256 b416eea6042d774359f7a141e4e57704c3220363ab8e0bf5c212b1bd2976092b SHA512 6c787b2ba3994bc720a96a1075b4c5ecfae734bbda9f5ae86464f1c83eea7e259130a2e8cd2e2f389f10293037841271556ba810ddcd4800f668625f47f9ecf1 WHIRLPOOL 69532951fda41c1e69de0c74e080a3a16b2406134585c1f6951c66caa2b5bd19893d02348ae21e2f46a48e1120797b7f999eda90303fcc5c659ad0d8f9a7c4d2
DIST geoclue-2.2.0.tar.xz 338912 SHA256 a490de0d4f97cb65f81e9fd0f687c7e84ef2c41509c214a1438964f541c7d446 SHA512 78ddd7a6df8066d97fb00758106f0fe307b9db9dd3d6a90b922bf31a031a53ac1c2c450a7a91c45ddae3f8c98fec54e7fe653f1f1f45935833860e5a24647c01 WHIRLPOOL fb76dde50855a0c533c1100571eae3e06c42827133f30928280ef1ca869f8d9f48a60e4959cdefacd7771408bfe608697e0a04c2ec461035b685fc18dffc9066
DIST geoclue-2.4.0.tar.xz 389528 SHA256 a4dffe200a351c9c39d705e70be7bfa2ad122440ec8d9da98af1e62eaf4effca SHA512 604b32303ce5e14c23e28c4958ccefe9d78958d81fe9e015968b6cd291dcfd01569ecc8b326a863a60f16790a083d8915b729866cae62d44baf6aa9e5cb3f354 WHIRLPOOL 433389cfbe4294cbc17c1896730ed78c1d1ea009bb688732492d0a3977745afd95a844a15ff1ad65b0634872cad9683ec55d54ea46fa39682fcb271ebbd2d1a8

@ -1,47 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
inherit gnome2 systemd user versionator
MY_PV=$(get_version_component_range 1-2)
DESCRIPTION="A geoinformation D-Bus service"
HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
LICENSE="LGPL-2"
SLOT="2.0"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE="+modemmanager"
RDEPEND="
>=dev-libs/glib-2.34:2
>=dev-libs/json-glib-0.14
>=net-libs/libsoup-2.42:2.4
sys-apps/dbus
modemmanager? ( >=net-misc/modemmanager-1 )
!<sci-geosciences/geocode-glib-3.10.0
"
DEPEND="${RDEPEND}
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1
>=dev-util/intltool-0.40
virtual/pkgconfig
"
src_configure() {
# debug only affects CFLAGS
gnome2_src_configure \
--with-dbus-service-user=geoclue \
$(use_enable modemmanager 3g-source) \
$(use_enable modemmanager modem-gps-source) \
$(systemd_with_unitdir)
}
pkg_preinst() {
enewgroup geoclue
enewuser geoclue -1 -1 /var/lib/geoclue geoclue
}

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -14,8 +14,8 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz
LICENSE="LGPL-2"
SLOT="2.0"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE="+modemmanager"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
IUSE="+modemmanager zeroconf"
RDEPEND="
>=dev-libs/glib-2.34:2
@ -23,12 +23,14 @@ RDEPEND="
>=net-libs/libsoup-2.42:2.4
sys-apps/dbus
modemmanager? ( >=net-misc/modemmanager-1 )
zeroconf? ( >=net-dns/avahi-0.6.10 )
!<sci-geosciences/geocode-glib-3.10.0
"
DEPEND="${RDEPEND}
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1
>=dev-util/intltool-0.40
sys-devel/gettext
virtual/pkgconfig
"
@ -39,6 +41,7 @@ src_configure() {
$(use_enable modemmanager 3g-source) \
$(use_enable modemmanager cdma-source) \
$(use_enable modemmanager modem-gps-source) \
$(use_enable zeroconf nmea-source) \
$(systemd_with_unitdir)
}

@ -1,4 +1,2 @@
DIST boost.m4-32553aaf4d5090da19aa0ec33b936982c685009f.zip 48610 SHA256 c7125b532d10e14c4969446b2a9297bfe4ee58d33fedc54a6cb8937e7bc0d41c SHA512 717232e8076f585f64fd7d11128168ab6ed002675f13f0a21c22a6cba57756f11fd63a621d003f90403ffbdab95806a42dba49d3f82b847d2a1e743710c6ef34 WHIRLPOOL a6ccc5feece027b78512c587b60215574ba1a8a826a3b559a7fde81c544be7a24a2d118e9e558cb592bc7441371ac38d463f757632a94e25726346c3087c3941
DIST gnote-3.14.2.tar.xz 3146108 SHA256 4d01745cab0a01c6b4a921c376c11f1dcb40bf3e635fb88739afb05994a89c22 SHA512 100c86330876507e784300407c9b66de0ee709c0a0368a51c6823e37bc97d8891b52630c1e33fcb09c6d3f7dedbfa5c323cb8326476b0cef2bdfc6dfc88ba2a0 WHIRLPOOL 5b965f8c45814504e8b679f6f4eabfc1907af2cc30c5c45b36efa9fa19bbd57e65739b356f2ea934d6a5c260b0ee301007ed11edc31a73d5921aeb93d1717ca9
DIST gnote-3.16.1.tar.xz 3059032 SHA256 8360a8ddfbc1cddd8970a29c66965f2de4d1330145f7cc7d47831205e2b10087 SHA512 33a5485343e08ab9adbd36aacc63f779991759d753e7c3132b14465b128596b77a2ba6517eaec188dd042b89c38100bf83ddd772f0cf0bf338f9ec41139e68be WHIRLPOOL 60dd34fed6a611c4484d39eab945e8806421f6df7f269dca928f4a84a7442d249faa2677877067cb657d79b37b267dd0ca42d7a25d3d2b54f24fa9f87d56423d
DIST gnote-3.16.2.tar.xz 3068136 SHA256 5c5b55b5c548d15e344d59fdd2a0260b1acbd13a9fa4cf9bfc1fe6e68a041e07 SHA512 b9d405ad8392d526fcb4098952c6531ba99b1a9b74a1bb857886b3017b676938e001ea7332bd189d5bdbbf554b40bcff57c995d6391135d4176ba00529d4b130 WHIRLPOOL c6d94674093eb1883b87c5da9d302c99f73fd32e51d728b406d2f8f8a40cc8eac85e6be39f5d0ad38d5f492699c1d97a7e642dc31df791cde16b09957d98f418
DIST gnote-3.18.0.tar.xz 3300404 SHA256 4828363ae3ddac57d37a0a2b17882be8fe67afcecf97ae992cd744b95da1c348 SHA512 76802759353a11278e4f47a14dc62d3d3bcec61a0a05619cc151bde1969a4675aba26f04b77406dd5f9074b292ec9b8c1288e4e00cb1577141d7bd605416acc0 WHIRLPOOL d2a55d3de08f460edaf8f8c8446766fccbe0c6aff43e82532b00b8e0af8932cdbfda573392e28cc9d9ee47ac8959cc8b23f98a2b3273761ec431dfdd9017f0f0

@ -1,82 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
inherit autotools gnome2 readme.gentoo
DESCRIPTION="Desktop note-taking application"
HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
BOOST_M4_COMMIT=32553aaf4d5090da19aa0ec33b936982c685009f
SRC_URI="${SRC_URI}
https://github.com/tsuna/boost.m4/archive/${BOOST_M4_COMMIT}.zip -> boost.m4-${BOOST_M4_COMMIT}.zip"
# Use sys-devel/boost-m4 when it's bumped, bug #549618
LICENSE="GPL-3+ FDL-1.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug X"
# Automagic glib-2.32 dep
COMMON_DEPEND="
>=app-crypt/libsecret-0.8
>=app-text/gtkspell-3.0:3
>=dev-cpp/glibmm-2.32:2
>=dev-cpp/gtkmm-3.10:3.0
>=dev-libs/boost-1.34
>=dev-libs/glib-2.32:2
>=dev-libs/libxml2-2:2
dev-libs/libxslt
>=sys-apps/util-linux-2.16:=
>=x11-libs/gtk+-3.10:3
X? ( x11-libs/libX11 )
"
RDEPEND="${COMMON_DEPEND}
gnome-base/gsettings-desktop-schemas
"
DEPEND="${DEPEND}
app-text/docbook-xml-dtd:4.1.2
dev-util/desktop-file-utils
>=dev-util/intltool-0.35.0
virtual/pkgconfig
"
src_prepare() {
# Use newer boost.m4 to allow build with gcc-5.1; fixed upsteam in 3.16
cp "../boost.m4-${BOOST_M4_COMMIT}/build-aux/boost.m4" m4/ || die
eautoreconf
# Do not alter CFLAGS
sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
gnome2_src_prepare
if has_version net-fs/wdfs; then
DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
synchronize notes."
else
DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
If you want to use that functionality just emerge net-fs/wdfs.
Gnote will automatically detect that you did and let you use it."
fi
}
src_configure() {
gnome2_src_configure \
--disable-static \
$(use_enable debug) \
$(use_with X x11-support) \
ITSTOOL=$(type -P true)
}
src_install() {
gnome2_src_install
readme.gentoo_create_doc
}
pkg_postinst() {
gnome2_pkg_postinst
readme.gentoo_print_elog
}

@ -23,7 +23,7 @@ COMMON_DEPEND="
>=dev-cpp/glibmm-2.32:2
>=dev-cpp/gtkmm-3.10:3.0
>=dev-libs/boost-1.34
>=dev-libs/glib-2.32:2
>=dev-libs/glib-2.32:2[dbus]
>=dev-libs/libxml2-2:2
dev-libs/libxslt
>=sys-apps/util-linux-2.16:=
@ -37,6 +37,7 @@ DEPEND="${DEPEND}
app-text/docbook-xml-dtd:4.1.2
dev-util/desktop-file-utils
>=dev-util/intltool-0.35.0
dev-util/itstool
virtual/pkgconfig
"
@ -59,8 +60,7 @@ src_configure() {
gnome2_src_configure \
--disable-static \
$(use_enable debug) \
$(use_with X x11-support) \
ITSTOOL=$(type -P true)
$(use_with X x11-support)
}
src_install() {

@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug selinux vim-syntax"
CDEPEND="

@ -1,3 +1,2 @@
DIST tracker-1.2.6.tar.xz 6049860 SHA256 09851691d527b505ed96987c08142f4dbe4f511ea155b66e99b83f73da7c93c4 SHA512 b812d8dba3225f30fa0f091617acd294d1ead23a67ebfe12ced08c24ae7fcef017b602241d4205a696adb51c0bfcaebdd0a40317c95177ba934eeae99f46165f WHIRLPOOL d4be5d8d63ca9268bd8be4eee4096e344fb17ac1d36e559ba5548b1dab099d9169f9973fee9d80bec8afa1286306d71596a9f2c3031333ab08c46e2dda59cdda
DIST tracker-1.4.0.tar.xz 5940004 SHA256 c87c35b55ab3a201f6bf306b812532de2bd35f3946a7fe966963c5d3e3d251eb SHA512 1c2fd8d877297cbe30dfe933b05a5fcf46a1a9b96b76f09dc56e888223e7828ee75008e79505d86f4f824f449ac5f984cc7bebcdf23fe42924d7de98afc90626 WHIRLPOOL 69d72e138d9f63376591087b1d5d7e2335cde72bce5a9fd031fa5d4bbaf2b9d7d917871f0ea5df82e4790c043220a8afe21be74ac1ac1601a20d846ac04e2c1c
DIST tracker-1.4.1.tar.xz 5937232 SHA256 94ecf25a64f4502664e0c45ec25dae0a91f00ad893fb85dd1c2ffe336563e328 SHA512 f9be6e88af4b41e990b10bb9ed1e56acf7dfa3f45d2698cdd9168cf9d98b232ea78c82a3c6e0b7026a4a08e06ce65c1d28ae125ef98e4e0c1edc9a131c4ab7cb WHIRLPOOL e11debc1df001eb8af581fae85136601891c8644710fe2f65c6d80d4ab5eba099291ce9941938494414084bc83384822bdb122523104dbb5201e0f52e05b0534
DIST tracker-1.6.0.tar.xz 4929004 SHA256 7e2729627224f43f8cd99c18d027a3b984e049fe924a265a9b31857566c9e28a SHA512 7dfb173cfd9121c34e637b85328b0c5bb7884d71696058a37f86ca3ee1539ce8600abb69172df9cf54b43f8b2b9e62a0acaa6a3c92b097fc3d31e2190450a674 WHIRLPOOL cb51aa3b00abe804cec77ed5d8d4da0485bec1b2aedb4465eaf4b652277740ee125ad1a5d3e707ab2ed1766134fda1b427f0de1140aef7375b824c3295ee834c

@ -1,269 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )
VALA_MIN_API_VERSION="0.18"
inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
DESCRIPTION="A tagging metadata database, search tool and indexer"
HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/100"
IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager
pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
REQUIRED_USE="
?? ( gstreamer ffmpeg )
cue? ( gstreamer )
upnp-av? ( gstreamer )
!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
"
# According to NEWS, introspection is non-optional
# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
# sqlite-3.7.16 for FTS4 support
RDEPEND="
>=app-i18n/enca-1.9
>=dev-db/sqlite-3.7.16:=
>=dev-libs/glib-2.40:2
>=dev-libs/gobject-introspection-0.9.5
>=dev-libs/icu-4.8.1.1:=
|| (
>=media-gfx/imagemagick-5.2.1[png,jpeg=]
media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
>=media-libs/libpng-1.2:0=
>=media-libs/libmediaart-0.5:1.0
>=x11-libs/pango-1:=
sys-apps/util-linux
cue? ( media-libs/libcue )
eds? (
>=mail-client/evolution-3.3.5:=
>=gnome-extra/evolution-data-server-3.3.5:=
<mail-client/evolution-3.5.3
<gnome-extra/evolution-data-server-3.5.3 )
elibc_glibc? ( >=sys-libs/glibc-2.12 )
exif? ( >=media-libs/libexif-0.6 )
ffmpeg? ( >=virtual/ffmpeg-9 )
firefox-bookmarks? ( || (
>=www-client/firefox-4.0
>=www-client/firefox-bin-4.0 ) )
flac? ( >=media-libs/flac-1.2.1 )
gif? ( media-libs/giflib )
gsf? ( >=gnome-extra/libgsf-1.14.24 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0 )
gtk? (
>=dev-libs/libgee-0.3:0.8
>=x11-libs/gtk+-3:3 )
iptc? ( media-libs/libiptcdata )
iso? ( >=sys-libs/libosinfo-0.2.9:= )
jpeg? ( virtual/jpeg:0 )
upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) )
mp3? ( >=media-libs/taglib-1.6 )
networkmanager? ( >=net-misc/networkmanager-0.8 )
pdf? (
>=x11-libs/cairo-1:=
>=app-text/poppler-0.16:=[cairo,utils]
>=x11-libs/gtk+-2.12:2 )
playlist? ( >=dev-libs/totem-pl-parser-3 )
rss? ( net-libs/libgrss:0.5 )
thunderbird? ( || (
>=mail-client/thunderbird-5.0
>=mail-client/thunderbird-bin-5.0 ) )
tiff? ( media-libs/tiff:0 )
upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
vorbis? ( >=media-libs/libvorbis-0.22 )
xml? ( >=dev-libs/libxml2-2.6 )
xmp? ( >=media-libs/exempi-2.1 )
xps? ( app-text/libgxps )
!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(vala_depend)
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.8
>=dev-util/intltool-0.40.0
>=sys-devel/gettext-0.17
virtual/pkgconfig
gtk? ( >=dev-libs/libgee-0.3 )
test? (
>=dev-libs/dbus-glib-0.82-r1
>=sys-apps/dbus-1.3.1[X] )
"
PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
# configure mixes enable-compile-warnings and with-compile-warnings
# See upstream bug #705315
QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
function inotify_enabled() {
if linux_config_exists; then
if ! linux_chkconfig_present INOTIFY_USER; then
ewarn "You should enable the INOTIFY support in your kernel."
ewarn "Check the 'Inotify support for userland' under the 'File systems'"
ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
die 'missing CONFIG_INOTIFY'
fi
else
einfo "Could not check for INOTIFY support in your kernel."
fi
}
pkg_setup() {
linux-info_pkg_setup
inotify_enabled
python-any-r1_pkg_setup
}
src_prepare() {
# Don't run 'firefox --version' or 'thunderbird --version'; it results in
# access violations on some setups (bug #385347, #385495).
create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
# Skip broken tests
# https://bugzilla.gnome.org/show_bug.cgi?id=699408
sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
-i tests/libtracker-common/tracker-file-utils-test.c || die
# Fails inside portage, not outside
# https://bugzilla.gnome.org/show_bug.cgi?id=699413
sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
-i tests/tracker-steroids/tracker-test.c || die
# Looks like sorting got fixed but not test reference files
sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \
-o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die
sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \
-o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die
eautoreconf # See bug #367975
gnome2_src_prepare
vala_src_prepare
}
src_configure() {
local myconf=""
if use gstreamer ; then
myconf="${myconf} --enable-generic-media-extractor=gstreamer"
if use upnp-av; then
myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
else
myconf="${myconf} --with-gstreamer-backend=discoverer"
fi
elif use ffmpeg ; then
myconf="${myconf} --enable-generic-media-extractor=libav"
else
myconf="${myconf} --enable-generic-media-extractor=external"
fi
# unicode-support: libunistring, libicu or glib ?
# According to NEWS, introspection is required
# is not being generated
# nautilus extension is in a separate package, nautilus-tracker-tags
gnome2_src_configure \
--disable-hal \
--disable-nautilus-extension \
--enable-abiword \
--enable-artwork \
--enable-dvi \
--enable-enca \
--enable-guarantee-metadata \
--enable-icon \
--enable-introspection \
--enable-libmediaart \
--enable-libpng \
--enable-miner-apps \
--enable-miner-user-guides \
--enable-ps \
--enable-text \
--enable-tracker-fts \
--enable-tracker-writeback \
--with-unicode-support=libicu \
$(use_enable cue libcue) \
$(use_enable eds miner-evolution) \
$(use_enable exif libexif) \
$(use_enable firefox-bookmarks miner-firefox) \
$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
FIREFOX="${S}"/firefox-version.sh \
$(use_enable flac libflac) \
$(use_enable gif libgif) \
$(use_enable gsf libgsf) \
$(use_enable gtk tracker-needle) \
$(use_enable gtk tracker-preferences) \
$(use_enable iptc libiptcdata) \
$(use_enable iso libosinfo) \
$(use_enable jpeg libjpeg) \
$(use_enable upower upower) \
$(use_enable miner-fs) \
$(use_enable mp3 taglib) \
$(use_enable mp3) \
$(use_enable networkmanager network-manager) \
$(use_enable pdf poppler) \
$(use_enable playlist) \
$(use_enable rss miner-rss) \
$(use_enable test functional-tests) \
$(use_enable test unit-tests) \
$(use_enable thunderbird miner-thunderbird) \
$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
THUNDERBIRD="${S}"/thunderbird-version.sh \
$(use_enable tiff libtiff) \
$(use_enable vorbis libvorbis) \
$(use_enable xml libxml2) \
$(use_enable xmp exempi) \
$(use_enable xps libgxps) \
${myconf}
}
src_test() {
export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
unset DBUS_SESSION_BUS_ADDRESS
Xemake check
}
src_install() {
gnome2_src_install
# Manually symlink extensions for {firefox,thunderbird}-bin
if use firefox-bookmarks; then
dosym /usr/share/xul-ext/trackerfox \
/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
fi
if use thunderbird; then
dosym /usr/share/xul-ext/trackerbird \
/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
fi
}
create_version_script() {
# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
local v=$(best_version ${1})
v=${v#${1}-}
local vbin=$(best_version ${1}-bin)
vbin=${vbin#${1}-bin-}
if [[ -z ${v} ]]; then
v=${vbin}
else
version_compare ${v} ${vbin}
[[ $? -eq 1 ]] && v=${vbin}
fi
echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
chmod +x "$3" || die
}

@ -6,9 +6,8 @@ EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )
VALA_MIN_API_VERSION="0.18"
inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
DESCRIPTION="A tagging metadata database, search tool and indexer"
HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
@ -35,7 +34,7 @@ RDEPEND="
>=app-i18n/enca-1.9
>=dev-db/sqlite-3.7.16:=
>=dev-libs/glib-2.40:2
>=dev-libs/gobject-introspection-0.9.5
>=dev-libs/gobject-introspection-0.9.5:=
>=dev-libs/icu-4.8.1.1:=
|| (
>=media-gfx/imagemagick-5.2.1[png,jpeg=]
@ -80,7 +79,7 @@ RDEPEND="
>=app-text/poppler-0.16:=[cairo,utils]
>=x11-libs/gtk+-2.12:2 )
playlist? ( >=dev-libs/totem-pl-parser-3 )
rss? ( net-libs/libgrss:0.5 )
rss? ( net-libs/libgrss:0 )
stemmer? ( dev-libs/snowball-stemmer )
thunderbird? ( || (
>=mail-client/thunderbird-5.0
@ -102,17 +101,13 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.40.0
>=sys-devel/gettext-0.17
virtual/pkgconfig
gtk? ( >=dev-libs/libgee-0.3 )
gtk? ( >=dev-libs/libgee-0.3:0.8 )
test? (
>=dev-libs/dbus-glib-0.82-r1
>=sys-apps/dbus-1.3.1[X] )
"
PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
# configure mixes enable-compile-warnings and with-compile-warnings
# See upstream bug #705315
QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
function inotify_enabled() {
if linux_config_exists; then
if ! linux_chkconfig_present INOTIFY_USER; then
@ -134,9 +129,6 @@ pkg_setup() {
}
src_prepare() {
# Fix position of AM_CONDITIONAL, bug #550910, upstream bug #750368
epatch "${FILESDIR}"/${PN}-1.4.0-have-gstreamer-fix.patch
# Don't run 'firefox --version' or 'thunderbird --version'; it results in
# access violations on some setups (bug #385347, #385495).
create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
@ -194,6 +186,7 @@ src_configure() {
--enable-tracker-fts \
--enable-tracker-writeback \
--with-unicode-support=libicu \
--with-bash-completion-dir="$(get_bashcompdir)" \
$(use_enable cue libcue) \
$(use_enable eds miner-evolution) \
$(use_enable exif libexif) \

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit python-single-r1
DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"

@ -0,0 +1,85 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 pypy )
inherit python-single-r1
DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2"
SLOT="0"
IUSE="examples graphviz highlight test vim-syntax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
dev-libs/libxslt
graphviz? ( media-gfx/graphviz )
app-text/docbook-xml-dtd:4.5
app-text/dblatex
|| ( www-client/w3m www-client/lynx )
highlight? ( || ( dev-util/source-highlight \
dev-python/pygments[${PYTHON_USEDEP}] \
app-text/highlight )
)
${PYTHON_DEPS}
"
DEPEND="test? ( dev-util/source-highlight
media-sound/lilypond
media-gfx/imagemagick
dev-texlive/texlive-latex
app-text/dvipng
media-gfx/graphviz
${PYTHON_DEPS} )
"
src_prepare() {
if ! use vim-syntax; then
sed -i -e '/^install/s/install-vim//' Makefile.in || die
else
sed -i\
-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-e 's:/etc/vim::' \
Makefile.in || die
fi
# Only needed for prefix - harmless (does nothing) otherwise
sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
"${S}/asciidoc.py" || die
}
src_configure() {
econf --sysconfdir="${EPREFIX}"/usr/share
}
src_install() {
use vim-syntax && dodir /usr/share/vim/vimfiles
emake DESTDIR="${D}" install
python_fix_shebang "${ED}"/usr/bin/*.py
dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
# Below results in some files being installed twice in different locations, but they are in the right place,
# uncompressed, and there won't be any broken links. See bug #483336.
if use examples; then
cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
fi
docompress -x /usr/share/doc/${PF}/examples
}
src_test() {
cd tests || die
local -x ASCIIDOC_PY=../asciidoc.py
"${PYTHON}" test${PN}.py update || die
"${PYTHON}" test${PN}.py run || die
}

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 pypy )
[ "$PV" == "9999" ] && inherit mercurial autotools
inherit python-single-r1
DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
HOMEPAGE="http://www.methods.co.nz/asciidoc/"
if [ "$PV" == "9999" ]; then
EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
@ -17,7 +17,7 @@ if [ "$PV" == "9999" ]; then
KEYWORDS=""
else
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
@ -30,7 +30,12 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
dev-libs/libxslt
graphviz? ( media-gfx/graphviz )
app-text/docbook-xml-dtd:4.5
highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
app-text/dblatex
|| ( www-client/w3m www-client/lynx )
highlight? ( || ( dev-util/source-highlight \
dev-python/pygments[${PYTHON_USEDEP}] \
app-text/highlight )
)
${PYTHON_DEPS}
"
DEPEND="test? ( dev-util/source-highlight

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer>
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
<email>marcec@gmx.de</email>
<name>Marc Joliet</name>
<description>Proxied maintainer. Assign bugs to him.</description>
</maintainer>
<use>
<flag name="highlight">Enable source code highlighting</flag>

@ -1,2 +1,2 @@
DIST evince-3.14.2.tar.xz 3089840 SHA256 4c591d0b879092a5f6c9140b75f15bdea3665a332e9b384957c453fd67bf0070 SHA512 f6a2b4037a055997316f2820b2ec6d171f51b0005b16070a2f990d5738ad39a14cc6e4662ad785da528d5e8d8ac48bba3a628c0b728578b00f09859d08b79aa6 WHIRLPOOL 02dc43bf594480a02a3e76e95e0391cc13ca57c0974e304181d3e9a25361298fbdfc9ae43ff03f9e564d8d5704f301021b700da61a684987908fd0fe6459fce9
DIST evince-3.16.1.tar.xz 3113776 SHA256 06ff75065b2a30cd588c402f6bd2ea88ee3166181805e0cc00bd54f71dbf6130 SHA512 bca890e2203e8c5d092a9a728f9e0545437e701eb2af790edc074b080d8529e639132e77caff2f77e8f1b8eb359b2c094af9252c08fb8518c98a6fb554c7dc6c WHIRLPOOL 69ce52248097cfc23848a14c71a845256c6b668d2a72f43af3eefbdeb0ceb2877811ef389bf337f410b6b54b9d456baa172b5067b9389eda7588c61ce44be8df
DIST evince-3.18.2.tar.xz 3159888 SHA256 42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17 SHA512 9d73d23de18f89034bf3ba1f18aba37316ddd6304370f3442a39c62d95a3443a51b1b7c641616f7b2d2d4deb316f0ea5246650eee3e4458a2356c9f2b2406fe6 WHIRLPOOL 01fd8d0289319c6cd41ee2581a896428f483c960c4f73417102f0697900fe14418ffdcc5811e8f3cfe7be881df54b97f6d8bb840e81db06fa61fc8c9f0ea29da

@ -14,8 +14,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
# not mature enough
@ -28,7 +28,7 @@ COMMON_DEPEND="
>=dev-libs/libxml2-2.5:2
sys-libs/zlib:=
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.14:3[introspection?]
>=x11-libs/gtk+-3.16.0:3[introspection?]
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.10:=
>=app-text/poppler-0.24[cairo]
@ -37,9 +37,13 @@ COMMON_DEPEND="
virtual/tex-base
dev-libs/kpathsea:=
t1lib? ( >=media-libs/t1lib-5:= ) )
gnome? ( gnome-base/gnome-desktop:3 )
introspection? ( >=dev-libs/gobject-introspection-1 )
libsecret? ( >=app-crypt/libsecret-0.5 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
media-libs/gst-plugins-good:1.0 )
gnome? ( gnome-base/gnome-desktop:3= )
gnome-keyring? ( >=app-crypt/libsecret-0.5 )
introspection? ( >=dev-libs/gobject-introspection-1:= )
nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
postscript? ( >=app-text/libspectre-0.2:= )
tiff? ( >=media-libs/tiff-3.6:0= )
@ -50,9 +54,8 @@ RDEPEND="${COMMON_DEPEND}
gnome-base/librsvg
|| (
>=x11-themes/adwaita-icon-theme-2.17.1
>=x11-themes/gnome-icon-theme-2.17.1
( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic )
>=x11-themes/hicolor-icon-theme-0.10 )
x11-themes/gnome-icon-theme-symbolic
"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
@ -60,6 +63,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.13
>=dev-util/intltool-0.35
dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
"
@ -85,8 +89,9 @@ src_configure() {
--enable-dbus \
$(use_enable djvu) \
$(use_enable dvi) \
$(use_with libsecret keyring) \
$(use_enable gstreamer multimedia) \
$(use_enable gnome libgnome-desktop) \
$(use_with gnome-keyring keyring) \
$(use_enable introspection) \
$(use_enable nautilus) \
$(use_enable nsplugin browser-plugin) \
@ -94,6 +99,5 @@ src_configure() {
$(use_enable t1lib) \
$(use_enable tiff) \
$(use_enable xps) \
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
ITSTOOL=$(type -P true)
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
}

@ -14,7 +14,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""

@ -1,3 +1,3 @@
DIST yelp-tools-3.12.1.tar.xz 202816 SHA256 7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172 SHA512 205e3394267cd2e987069400c7507f546cbc75953b080d8dd22915a660288b7f073a996026fb1c383ac108da23a1682a8c30a009cf5038128a52796bb95cd9cd WHIRLPOOL e13b9dc99d8d8abf2bb3ef0babe0d00b756542bc5c0fc5407cd685f7650124731043d186cf0a754bc3a53060de3b541bdb3d18a03ffcbd68fa9cf96958d3e0cf
DIST yelp-tools-3.14.1.tar.xz 206688 SHA256 000222baf5d2db394df6025591054976b5cecd0b27872601de7538f36520f60f SHA512 4fd55d62165fc999f3576730942631b9af9c25001daa385fcf45b8a138e852a824028bad3f9cedbcc13f8881ae71f3ec8f7d5be6d0ecf22e408d3b08c5b67798 WHIRLPOOL ef26fff6ec81a7f599f83566172bcda1d431531726c11d03b92673acb3a2defe6bfb26a1febc6615a852a1808fc1dd5ef0648a4c5c05ca08ae03bebb919de63d
DIST yelp-tools-3.16.1.tar.xz 203568 SHA256 b4f66c145af1c6448dc51037d305d6844da13dc31d07729b8e29005ee4fef89c SHA512 5fbb2b5b907bdffc7ccf0a108a80c7fe1e5486be6774b3d799f10e3444e286fcf8055629fe7df22ae8ef5784e52133df1b8dca6ee13fa3c2191080e14546d956 WHIRLPOOL bf4c184780afd82db0a6076da6320b41257e304dec59a27d39a62fce477938dd41153cf41ba65769709b0b8d17d630ab4cf7c11b6ed6932351cd8e4bc5e7ef43
DIST yelp-tools-3.18.0.tar.xz 210712 SHA256 c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932 SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8 WHIRLPOOL 1a237128fd4306f41e2785f91dc616d2b526ff51b7c4f775caa333ddc6c701a4a65d8608fb2e09a248f4768a22db860b333c1e25f15c141a21c1ae3f93a93678

@ -8,18 +8,18 @@ GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="Collection of tools for building and converting documentation"
HOMEPAGE="https://www.gnome.org/"
HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="
>=dev-libs/libxml2-2.6.12
>=dev-libs/libxslt-1.1.8
dev-util/itstool
gnome-extra/yelp-xsl
>=gnome-extra/yelp-xsl-3.17.3
virtual/awk
"
DEPEND="${RDEPEND}

@ -1,3 +1,2 @@
DIST libxml++-2.36.0.tar.xz 861456 SHA256 bfdf327bf9ebd12946b7aa6a152045f209d5c9fecd06ebfcdf9b3e7c1af6e2e1 SHA512 52372b3a969dc4a16d1ec70275e3c97ac20acc14703a2875ba41d1eb8fe3f318c10e02d601ceac1a0d35f47e7d7033ebd5e87c122db6b373e847d543eddbe9a6 WHIRLPOOL 19804748859cbf6144e56f1ee1746cf2b30995c70e5f74a0dd3b51b38982832a9ece6a519f43e83dca424110f98bd86e8d3d4120ce8ac59b4b837f2d4f132bba
DIST libxml++-2.38.0.tar.xz 940844 SHA256 5698b03f5d320fb8310e30780e328f03debca12c557434ee031aea9baf3b1346 SHA512 539ea25b2e1f871dc0c06e4033659a3d6ee5bd3cb54f625ba47b0f8a8dead049602c5d28369a497c52f48f370625d5da1b187ef542fbdd2e54fd907b308cfc67 WHIRLPOOL 4056f4dedf27a6b52623bb070fc106a165d3a3f97b39e2c0f00ce2673f7901c6653c9c48ad5171b86bf8bbb9335baead8e7e0630adbefc13899dcf342c428677
DIST libxml++-2.38.1.tar.xz 947556 SHA256 882529189b03db6c69925b3f579ab1941feb4f02b5fe2612504ee7e498a4a05f SHA512 d60f283ca2a056bf81fd6083c10dd9d469bb62dcb06ded9ea3549bc1d0053ed14f47bd86394761825f69d9d0f3a02781f1fd121244b9ce8f9637ad21e0d177f8 WHIRLPOOL 92b4222bd1626e4e5baa6dbf1ff8479a594a49fe04bbc3279e1c2da41dd0c6e12b57e5d5eaa295f3f6361af53f2288eb9e2cb31dbdbd8e781178717327a5069c
DIST libxml++-2.40.1.tar.xz 955220 SHA256 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9 SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a WHIRLPOOL f1888bc6f90dd10dea04f617f317a2eed79f2c4981e03b1fbdb3cefcc4bfeadc256c5dd6163d82b7b33cb29d8d15de98de822d2d40f3fa8e8851efe827cdff72

@ -1,36 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
GNOME_ORG_MODULE="${PN/pp/++}"
inherit gnome2 multilib-minimal
DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
LICENSE="LGPL-2.1"
SLOT="2.6"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc test"
RDEPEND=">=dev-libs/libxml2-2.7.3[${MULTILIB_USEDEP}]
>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
virtual/pkgconfig"
multilib_src_prepare() {
gnome2_src_prepare
}
multilib_src_configure() {
ECONF_SOURCE="${S}" gnome2_src_configure \
$(use_enable doc documentation)
}
multilib_src_install() {
gnome2_src_install
}

@ -1,37 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
GNOME_ORG_MODULE="${PN/pp/++}"
inherit gnome2
DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
LICENSE="LGPL-2.1"
SLOT="2.6"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc test"
RDEPEND=">=dev-libs/libxml2-2.7.3
>=dev-cpp/glibmm-2.32"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README*"
G2CONF="${G2CONF} $(use_enable doc documentation)"
gnome2_src_prepare
}
src_install() {
gnome2_src_install
rm -fr "${ED}"usr/share/doc/libxml++*
use doc && dohtml docs/reference/html/*
}

@ -4,7 +4,6 @@
EAPI="5"
GCONF_DEBUG="no"
#GNOME2_LA_PUNT="yes"
GNOME_ORG_MODULE="${PN/pp/++}"
inherit gnome2 multilib-minimal
@ -18,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x
IUSE="doc"
RDEPEND="
>=dev-libs/libxml2-2.7.3[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.7.7[${MULTILIB_USEDEP}]
>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}

@ -14,7 +14,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE='20018_all_mysql-5.6.25-without-clientlibs-tools.patch'

@ -5,9 +5,14 @@ DIST icedtea-bin-core-7.2.5.6-r1-ppc.tar.xz 42627680 SHA256 c0af7c735b01f0ddb809
DIST icedtea-bin-core-7.2.6.1-amd64.tar.xz 52856100 SHA256 48d596cf5f9ba52368c48d6cc94e12a3a5d6e8c2ed880e689f005eeeade7cc72 SHA512 4dd5709400033fcdf2948b418b9aa4bbb90a3903d40f6a22571b4b181eec2336b802f100bf1e524ea1d13bfd340e60bb00bcde24d4f80fe925585f1971c55f54 WHIRLPOOL dec45c96d8c1a35bd4d83724eff84aaffc73b5671bbcd8837a3030f2adee9716517f950a2e606d2a4b021a83d25e8feb7457b3b3d83e8da920cf95533c057095
DIST icedtea-bin-core-7.2.6.1-arm.tar.xz 43914036 SHA256 215dbe4907da2038d0aed3e37149afce56fb837ad3ba0d521cd92b5ebb15c5d5 SHA512 df6179db20db3e12e9688816fee18f1782a3400c91d3bd691cd3fb88322f7855b08582d57ca8a9da3bda1d0c30106518d9d02b911f4f8cc24d95636be22807ee WHIRLPOOL d313aac6f33ff28e873976be055b879e3c8e559022f15c21401ccc5a5c35715a08a43feb60d0c52250161cdea815be2edddd51a6965695287c25627f2779f9d9
DIST icedtea-bin-core-7.2.6.1-x86.tar.xz 53528524 SHA256 b7f24f28b70c2b0886b94f48daeebe0391cce2e57ad83bd876dd302b67c96d42 SHA512 bf4aac17ff754bacb35e5b597d9bc60d88a7fa40619cf8c9613fa2d2776097e4c781132b4d66a8ca32ed49a2a07556d2a839b818e613116cc2f2b5f9e257d6a1 WHIRLPOOL 0e033c6e819edaa52eab51267a71236aedb9648f3b63f62a35db329e0fda2dc1dddf370c3da115360ffb2bd1c97aac88f6400cea9fb29f6210d9385720489062
DIST icedtea-bin-core-7.2.6.2-amd64.tar.xz 52999196 SHA256 6a91616948e46312f9a8ee5b3b3f685d9052485e1f2b120f4a45b472a50c9228 SHA512 bf424b0923cb3ad3181d3b618b439b68f767f6757905b4cfa2b0cc8cc71618f33c596102129c861ecc98f18a1ef73eb84a4277d7d6ac245513779c15750722d9 WHIRLPOOL 3fbad963bcb576c4d0d58ce089e87f2c5d2bf6f7d01e29d8406bf29dd938a247418694341203dc3d66cddf0e9361959276e694e0691203275dbc7cc108720c73
DIST icedtea-bin-core-7.2.6.2-arm.tar.xz 43981456 SHA256 4e3db1a1bf9e50b4c688adc639c6de97653840ac2407c78ab1122005fa13e2bc SHA512 33f3e2c2781376817b07bd89ebff3abbf2c8a820fe7d44b2f79eba43fa3ca0d73496d910ae3f92fa560cacbc737215399f6baf3659d1e8abe7c0dfaf5e7ef9ac WHIRLPOOL 3deebdbd62e4e23925d9b94bbe77e7d475b9d7cc9f8d896e1593d64590a623f295a76322b23972a5df7ee3fb8bb4747f1f4b0f6722336749eb4c19407a130128
DIST icedtea-bin-core-7.2.6.2-ppc.tar.xz 42889628 SHA256 606f3075153f6d158e9e3388a6270170109dd98f212c61ffb89d220d8d6329c8 SHA512 8a0887f27c9d07f78e3d0321478576c3761c23686e009e9e17aec03adff0e1dfb10433d5280e09862127d313108863414f0a4bfd319fa89fa886092c7f92d310 WHIRLPOOL 653cb61da00a3f3494fea12f5eee0491b80b1c9bbac1e93248ebdcbb8152501290ada111cf4430ef53f138095a05dc3f8951f3f20fdab01667655e0c08767309
DIST icedtea-bin-core-7.2.6.2-x86.tar.xz 54652528 SHA256 dada0681098ed67f6ad665cb2a005d26a3ab365e2aca85d0dd9e924e6943065c SHA512 2a0e4b934e7aa734d8d0cc0d8851182bbf17a7cb29d66ce3490ce157a8b282b974501c9106160c9dccffb7565b994136cb39952efe0c530855b14491255f55a9 WHIRLPOOL 3ee3f13b51a3c587612026ae686a46bddb457ba2fec4ffc8fd7fa94af697c039761436fcba634ccb6ceda6705844346617cc48f0532af41f78a8978ad54aa3b4
DIST icedtea-bin-doc-6.1.13.8.tar.xz 9844756 SHA256 71cffd016040d28366f8e50c983ca55a3af1d7b08a56c501838b78fc0d1837c1 SHA512 36a0691ad720869c2855345bd20dcccd60e7adfa90c511d829131997e9e995ab929a2f24955955b638b21672912a39774deacf72ee3390ae41e3d44e58eea5eb WHIRLPOOL 11892894ddae46a6f999e8e835a5d428fcb86643c20f44639d8b692090468ddecfdd7db4cebef0c422983950cfaf6d337b540effef64c6fb1f7d58ffd2e069e7
DIST icedtea-bin-doc-7.2.5.6.tar.xz 10420552 SHA256 97cafad29d26e1fba75fd848a3d35de0e84e83f36a9e345852f1d684a81e148b SHA512 53261dbbafad7af9b97cdc9b55430ebbbc7e4975acff7b73013f893eba5583c303abf32d77ab8fb641bac35ac5549c313bc1f4c94c27faed88ab23bc5c22aec4 WHIRLPOOL 6213996e1435acac287b2993814ae1f49c13ce58f9315731d2e327c3f9765b6119202e83735c504919b9487e04de23ee28ac2695f8a67a49652a4c01f19aa0c0
DIST icedtea-bin-doc-7.2.6.1.tar.xz 10603004 SHA256 33175237a2d35709197a59f26b5ea8bc5f3d60679964b8f3e985714080ce7a0d SHA512 e79ef83cbc7c33defb10bcdf1f5e56e07e3f187d181444a92edbe6cdbf58323c3c009bbddbdca35d2065145290cf5641bb688971b6c1fee337827c3b06394ec6 WHIRLPOOL 15a101cdc4f5cf3426980893e864fe04807c7d552971f249e09bc9bae0fa5c93a7839652c2d4d4099ba07cc32d50bb1d339b6ae6a9b8757776e391d1b30c34d7
DIST icedtea-bin-doc-7.2.6.2.tar.xz 10624484 SHA256 ed677d27cebe61433f12b0b586b29671121210e495374ed575d28b0a79f77c09 SHA512 e1475cee4db80eb071defe7af05483a1a6799bfd7511791cc3db01cc86decc956fe09f50cc19bd1850b917c02aa3c9a4b0d6c368031034d30a7e3c867d0eace8 WHIRLPOOL 2b80fc301c5e36d895b0934c55c3f17968e0cfac8a509a5b54dce77617b96fc53fa8baea6c6136983d7fbb7f0b43e465c2931b999a7991e530732949eeb0de25
DIST icedtea-bin-examples-6.1.13.8-amd64.tar.xz 1904080 SHA256 29c2933d4fc4c7e240c7406d403a2667a42c5a3faee82413d2255d7dccea6873 SHA512 84771c52b816f4d3f065871df83bdd05408b69941c807de0bdc7ea423cff436878aa58dd5d61cb1bfae35cb37e56e2b5d29be6f6073a744e6af2125d66578713 WHIRLPOOL a08c748dd757c5927abd65088b0961d2dfb716030cc07e64589e5394a434123cb018630766e0223c6578ceb7f67ee0a68f5b2a548b1c9f701a5cc13732b84ecc
DIST icedtea-bin-examples-6.1.13.8-ppc.tar.xz 1889932 SHA256 62bc68f31b1118d890c2add87a4d14663b0595aeb5fdfd8d904a59a19c4ed7f4 SHA512 22d38c9efa794165e1ecdb8cabb1ecaf8b9c27027cf28562721789c33c1a714e3d226b95a8c5420ff48a769c869ef09c575e76e8995f089037263ddfd72d21c5 WHIRLPOOL 031a8ffb8609028d089d047f1324352db90ef72be951bcedc158f671f2930c4ae5087e65e53ec59e4457a9e09b40ad6848b980b63e3494e0d1dd70721e6e640e
DIST icedtea-bin-examples-6.1.13.8-x86.tar.xz 1902616 SHA256 cd74d0b8056f7373f370ca62388c2e44786c3b68dccbf30cb9a3bc8ecc8353e4 SHA512 babcc73227115e19fe50b16f79f09e3a35d0c60de44823c3f6617c7276ff4b9efbfb5f03f1149948d4005524b3a136e74b0049a292d83ddf763626fc179d1883 WHIRLPOOL 6621c65b3f871cdc0769dd5361d7a4a17c56f5ca8eb2de1f4abc79ca6343784a5a43834e4906f4d371144615a3b3ed6db44370dc0950508d327587bf2e770ed2
@ -15,6 +20,11 @@ DIST icedtea-bin-examples-7.2.5.6-ppc.tar.xz 1785152 SHA256 5e798c0172e20653df30
DIST icedtea-bin-examples-7.2.6.1-amd64.tar.xz 1794976 SHA256 712c0077274e89f601ccd89af5393b959879930d511d5de1b5b377963297fd61 SHA512 70ca271ea0c764fb53009fe4e5f6f3abac9db8e687615c9153a90390fce22fb4f9712fd4a431f7475d2857a7b053b3cd82a9e151f8688e0835cc45dd79a060a3 WHIRLPOOL 53e36eab616a41c70841e37a0be93a0a71dd62169028fc873a52373f8a02c30ae48f5e6b23cdaa9da34d1246029f1737ebc21d519c5763bb0a2aff4c1c6436e5
DIST icedtea-bin-examples-7.2.6.1-arm.tar.xz 1778216 SHA256 3589b3bfefcfb13f3007852645c72760845014cde52c467a3ba627dfb27f7fc7 SHA512 1ae5b8316bdcf55275e436bfe8647c173be26a9a71ed3f79afa7b2e1d0e556aa7569f95f178c5b183376f6a8418021fcd79e73eae8775177ee1fe50647a23370 WHIRLPOOL d56c37d274b8227ffa2528a3ade58b38f154eade82fc33f545e8b6360a090ecbdf548501d5bf91f5c5a83005f6a42022e83456f02a576ef9bf79ccae2297c7a0
DIST icedtea-bin-examples-7.2.6.1-x86.tar.xz 1794276 SHA256 21561ec74d5f416f9ce26b849107cd5ed2326d34ecc9fd1315891c3c61cfc13c SHA512 ccf468cf55256fbf2f005762558281f3605b02f7877782d84aaaf5e9cfe030e4d296bc04b21af1c4a98e8ded97e9fafeb33722c81f8a91e5b9b10e864cb5074d WHIRLPOOL 77e70bec0c555c6fa7cc7b8d220aed8d86139bc4f423b96b7fde6d68f1b6176466e53a65f329d0c156925e9f3d7d9e086dbacbc920291c9103a517250faaacb0
DIST icedtea-bin-examples-7.2.6.2-amd64.tar.xz 1796688 SHA256 d1fa34dc87ef7947fd98fa222d6ed5fe30833dcdebb523edd2271913a2f21ee6 SHA512 0a6bdd498e1203d2fd6168b91dc3b2081ce0c102107523dbab78ca0e2b605c1f88c246f554f077245d76945726dc4151a898e5b2e42f6a5df4d04098b26f42bf WHIRLPOOL 42049d21a6e5b72cc091e63d60bdb84a774fb80d0f828d4d85e48efb219c51ad3c5239bbf466d2f80f56ddb9e57832f739eb783d2ff8ed4f23277f55b3f9adff
DIST icedtea-bin-examples-7.2.6.2-arm.tar.xz 1779804 SHA256 3fb597b80d4ef1253d36b032126622b91cbe030b492e68c372ebf1304f0d86ac SHA512 af210e3ab3b234c767fad0b0442276b8ac7d5e0c3bd98aa7e9c729a9239247911b6788a1e4415561ef889b63a242fffd7cb97452a611e84fb30a6413287ec26f WHIRLPOOL 95d4fbb9cbb74e279291d8a823158a66111211dee8d5a21e2665a89406f3f89dd69e40c57c48cb91e12ace620abc34a2b65977c4c3a96f66604c103e66f69284
DIST icedtea-bin-examples-7.2.6.2-ppc.tar.xz 1786908 SHA256 2506a0fa0f38008a5edffcab637a2c9091bd895fdcc8b25713c536e4c15957a4 SHA512 ad1bbf7ad71036c4f48efb0861776e3dd733249a19cb7ac5d154f55e3b3ee15f1a8642a45ffeaf7fb39f82416dc7ea2b8239c464a0c8284aa53502bcc2400f1c WHIRLPOOL a321523cf23211f565d47e16d0d3d539053a047bb7bf875e7a702288e01b807651024a8cee8b2b8a61929687ab9d0cba7ed62c857e28a900a066f0d8b1a2da87
DIST icedtea-bin-examples-7.2.6.2-x86.tar.xz 1796540 SHA256 58a876ab7452199456a4fa35f550a9aa8775df8a70e687073f7106eb69702c9e SHA512 c759f97f0ba22e0ebc1d70b3cb9a339b6e1186c707cef4a6d8f3dd512792e2a729fb89d1110aafc25d4438853c066ad4f1f3ac7ee12bf3d12d8ffb961a7af8c0 WHIRLPOOL 5aebeeb861616d8da0e14409223d886ffa99bcad34c0419e5e21ad52cf9f088d26952a8f3be4d9b0a0dbe720b31afc55308c499140a7456d4dca5bd2090611f6
DIST icedtea-bin-src-6.1.13.8.tar.xz 39773388 SHA256 c01deb2ef8ed9cf58284538e9f52651ff70b8349ec001f13314d69137f99ff4b SHA512 dba0cc027f3ed7589c7cb0ba7d9f1a401ef47a20a5ff502ad7e9b27d0f552a77f28ebbd9032d191ba3ac441955545b632d6fb242f67bc590a5f1a8d855b89ad8 WHIRLPOOL 6b835a7a6123a3843bd74506e52befafbc4792e792798660829d75ede09f6c283933d30d51ba01c87a16095b9faa1795bfec6539cb55709032e22d6395566d19
DIST icedtea-bin-src-7.2.5.6.tar.xz 39999236 SHA256 dba9a16d6ed8ba6bcd1090e469d176c979395a4828ea8875cde271d8bfff4a43 SHA512 9f7c7377d90058fecdbe08259b8b1b0678ba3df1ebfd13b7664088fe3bae0823631b0b548a0b65981c79318b7a63d566c79a6c3b3b77df434d5b4e0b9b8095f6 WHIRLPOOL 214c9fd79be0ef3f650a64c15e02e889475ee27c9c2b975ade20689bd8d2799617b2ba0eae55cb1596b77e987f5b14cd4ccaa583ff5ef4dd83e4dcbedff869af
DIST icedtea-bin-src-7.2.6.1.tar.xz 40026520 SHA256 60786fec57ebfa29297d03e3cded177fab8de09dbaebf74f82535d92fd3665ba SHA512 d045222dd06db827f0ceb62bb5fded08de66402803a978710d61005f9344d230450101b2fffcb3b8e05676682bd90ebe29e9e1ac57fdfd5197035f130ac483f0 WHIRLPOOL 793dd24fe432e54369490fcba7f8ed95f2e2b428c595570612cecd9a3194df9027fcec29a466f9c97b1c25c55d28eab7fe6565f21ae760cd8ea00f052f3b067d
DIST icedtea-bin-src-7.2.6.2.tar.xz 40010036 SHA256 d4cc4954ccaf2f4ee77eb44e7d16c568eff835a5e6ead4971c611774caaf2c02 SHA512 f2dace8e37dcfd23b6f5e6806fc21a62686e9addd545fd141e47d4c24e574a65c8ea5b9b4b6462e8633ebf61bac2a3ee0a1dcd94367a7b8723bbb5fc7a125bab WHIRLPOOL 6087cf6fc2463c2e7069379c75d01258247fa1613575a736f5653b4f969d3fa03291f4acd1a9c26863014af8838af96107a4e49766e0e09372d51f85b46d7c63

@ -0,0 +1,185 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit java-vm-2 multilib prefix toolchain-funcs versionator
dist="https://dev.gentoo.org/~chewi/distfiles"
TARBALL_VERSION="${PV}"
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
for arch in amd64 arm ppc x86; do
SRC_URI+="
${arch}? (
${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
)"
done
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
KEYWORDS="-* ~amd64 ~arm ~ppc ~x86"
IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
RESTRICT="preserve-libs strip"
QA_PREBUILT="opt/.*"
# gsettings-desktop-schemas is needed for native proxy support. #431972
RDEPEND=">=dev-libs/glib-2.40:2
>=dev-libs/nss-3.16.1-r1
>=dev-libs/nspr-4.10
>=gnome-base/gsettings-desktop-schemas-3.12.2
media-fonts/dejavu
>=media-libs/fontconfig-2.11:1.0
>=media-libs/freetype-2.5.3:2
>=media-libs/lcms-2.6:2
>=sys-devel/gcc-4.8.4
>=sys-libs/glibc-2.20
>=sys-libs/zlib-1.2.3-r1
virtual/jpeg:62
alsa? ( >=media-libs/alsa-lib-1.0 )
!headless-awt? (
>=media-libs/giflib-4.1.6-r1
media-libs/libpng:0/16
>=x11-libs/libX11-1.6
>=x11-libs/libXext-1.3
>=x11-libs/libXi-1.7
>=x11-libs/libXrender-0.9.4
>=x11-libs/libXtst-1.2
)
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
media-fonts/lklug
media-fonts/lohit-fonts
media-fonts/sazanami
)
cups? ( >=net-print/cups-2.0 )
gtk? (
>=dev-libs/atk-2.12
>=x11-libs/cairo-1.12
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.24:2
>=x11-libs/pango-1.36
)
selinux? ( sec-policy/selinux-java )"
DEPEND="!arm? ( dev-util/patchelf )"
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
pulseaudio? ( dev-java/icedtea-sound )"
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
fi
}
src_prepare() {
if ! use alsa; then
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
fi
if use headless-awt; then
rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
{,jre/}bin/policytool bin/appletviewer || die
fi
if ! use gtk; then
rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
fi
# NSS is already required because of SunEC. The nss flag in the
# icedtea package just comments or uncomments this line.
sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
if [[ -n "${EPREFIX}" ]]; then
# The binaries are built on a non-prefixed system so the
# fontconfig needs to have prefixes inserted.
sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
eprefixify jre/lib/fontconfig.Gentoo.properties
fi
# Fix the RPATHs, except on arm.
# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
# https://github.com/NixOS/patchelf/issues/8
if use arm; then
ewarn "The RPATHs on these binaries are normally modified to avoid"
ewarn "conflicts with an icedtea installation built from source. This"
ewarn "is currently not possible on ARM so please refrain from"
ewarn "installing dev-java/icedtea on the same system."
else
local old="/usr/$(get_libdir)/icedtea${SLOT}"
local new="${EPREFIX}/opt/${P}"
local elf rpath
for elf in $(find -type f -executable ! -name "*.cgi" || die); do
rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
if [[ -n "${rpath}" ]]; then
patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
fi
done
fi
}
src_install() {
local dest="/opt/${P}"
local ddest="${ED}${dest#/}"
dodir "${dest}"
# doins doesn't preserve executable bits.
cp -pRP bin include jre lib man "${ddest}" || die
dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
use doc && dodoc -r doc/html
if use examples; then
cp -pRP demo sample "${ddest}" || die
fi
if use source; then
cp src.zip "${ddest}" || die
fi
if use webstart || use nsplugin; then
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
fi
if use webstart; then
dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
fi
# Both icedtea itself and the icedtea ebuild set PAX markings but we
# disable them for the icedtea-bin build because the line below will
# respect end-user settings when icedtea-bin is actually installed.
java-vm_set-pax-markings "${ddest}"
set_java_env
java-vm_revdep-mask "${dest}"
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_postinst() {
if use nsplugin; then
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
elog "The switch should complete properly during the subsequent installation of icedtea-web"
elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
fi
fi
# Set as default VM if none exists
java-vm-2_pkg_postinst
}

@ -4,6 +4,8 @@
<herd>java</herd>
<use>
<flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="nss">Enable NSS security provider support</flag>
<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
</use>
</pkgmetadata>

@ -1,23 +1,13 @@
DIST icedtea-2.5-aarch64-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
DIST icedtea-2.5-corba-a146d87ff390.tar.bz2 1070505 SHA256 d2c060e77ac62a2ace76cf7d098973803398a33c627b40401ca36e9344442136 SHA512 065f138eeedddf0703a2229d10c384a6003b4404a6fa2766ef3a1df8d29d71f1fddc609b9840ddaa31553a29c287eab33d368e227ccc25650aba4e98d50b4aa2 WHIRLPOOL 274acd68bf5e06d68bac50253ebb0e68bf0333188636ce7d96a403778af737547d4a3a154c1bc99c8151816b18dba25cdda1febf19cada7f2e9f3c0884a3c51e
DIST icedtea-2.5-hotspot-383de087ee57.tar.bz2 7802328 SHA256 2831eeb73a4af0007fb31978e8a17aae1e9677bd545563956f99b1e0ec8bb923 SHA512 42d540632e315318e91a61ee21e2fb6c8e4b813d5bba734b9a1658be8799063a7547d6ee30846a070e806e63f77220a08e215d071c8f622cddfc1f923e9d7d07 WHIRLPOOL 747c4b273126989081789574a63a99ca8a03e9024e5626e9dd78c320df047bcb774610efb4a32cab8bf25b1e8b71f8b4268d298338edac512a46a43dc55179ba
DIST icedtea-2.5-jaxp-3d9457280537.tar.bz2 2738979 SHA256 488480d8f69297e38f4b6df0131dfc445b59cad9b99327f29096ad820c972c38 SHA512 743931ba791ba09d5f0c45d589e5ba2562f6bed395f766619c8d1d15fd35f709e888017387d6cd01005156dca756450c7c0d286ca8a1585c012099164d977920 WHIRLPOOL 3f78e43fd0a31f97b944ff87133795a0a71be9a8b0b4efeb718ff215d947267270de8533d4378d82f2685cc69f9b599b5acf70564527fb37452666e998a8ebc1
DIST icedtea-2.5-jaxws-bc5d03e92fd3.tar.bz2 2019582 SHA256 98c6c09d41ef3d179fb4f47e733be0f306ad85479473d5ec51c58acac07cf491 SHA512 a50929f80c40ddf11ad35571540a7d09c6b069b4d055dec41ff6c50d1d737bcf26fc7d14096d4528d184f7c83cadc61cf764664ecd25693afdbe48e59bf00c68 WHIRLPOOL c3e40d74a9ac4c2aa9e9a722c39de36f713b85b36517b8e1bc3b992d040a695c4fd50bafce5f4a4a8f55522faf580c16ba87818368d5a48d05e7e9a809880966
DIST icedtea-2.5-jdk-48b2e510f78e.tar.bz2 31880992 SHA256 c944ef8d1810e861b54d3f8122960dd4b247b52ed23afd5b1cb053da988fffe4 SHA512 84f4122ec8336b5e3c71b17426f77d0b7719d0e688f3c5a9606db5749187e7858334de5438b683729b73fb91200b8cf087ee2166cd284baab38b3ac5d08ac6a1 WHIRLPOOL 68d2f890434afab440dd8e63fcfc00bdeb792b276ed9bbf2eb813197e2842d7d5903f1f3ca04df830118ced1fe2443b211faebf6f172d9e6dfab82fb1e2ebf22
DIST icedtea-2.5-langtools-a6d3d79b4547.tar.bz2 1702391 SHA256 9f272f88ea0e8c090fb659c48f96f73fb066e6863f13f293e4ab19d691254693 SHA512 4a39600151f400cf6c17124757e4e8e877cf863445b9c95fb6c8c095f3f46072054f1b2f0262b4964594d6a330579cead0fdd423d61cfd425ec05b90121f79fe WHIRLPOOL 553ede3cf18308f79f4cedf57b2f491780532e23c546e158aca286076d6ab618d1fdf6d825a79fcf3c1a9fc18b2c130d2f84c29c37f3e19fe6e01a14bcb969d8
DIST icedtea-2.5-openjdk-44f140fd2873.tar.bz2 127517 SHA256 d100158d10a47b064f700f516874c987f105e05947e580d5a143e00fb0b30fad SHA512 82bceecd1fb29b184ea45e5cfbf819b497707e041bc8d25a4ca8447e736db5f5d859dd9ad0129ba2fe300ce3d2ace18d8e528967ec43e467ef12991a860ea5d3 WHIRLPOOL e037bbbd9f85d81ce57759e68f40116db3178a43f4260806e0734fc2a1cd05f86f43cdd82aacaa8f4780e75a1ec7c7e0a7780baf722803a0a711506f0ba847f2
DIST icedtea-2.5.6.tar.xz 2034152 SHA256 bb3c7e9fd372c737849d9d3129d935174492a0d924a2801223c822426338b8c4 SHA512 773601e4fc08d9a448f6f306e5678eca6f0b5b4704cdca66a40434de6e6b8208bc826e2a63235160b6b88bd92d746f8f7d1a74cfcfc0eaa58417ac3c8cb8aeb3 WHIRLPOOL 2443d7e1387f7d4d9f5b05d85a1768c9346e394713333862e62e24585091aaab0d74f9099c8aa1bd6add5b4cd5179132c238021f1a40576c7a40de43ab170bce
DIST icedtea-2.6-corba-2545636482d6.tar.bz2 1071895 SHA256 cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8 SHA512 16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12 WHIRLPOOL 98a317a85c4eed1098c7391f67e6687869337a1576bedc65ec4ddfde5885b4c514d12a5aebdac20a70970bb4c79d8b14f7bc153bf0b105b747f4e63ac79c3b79
DIST icedtea-2.6-hotspot-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
DIST icedtea-2.6-jaxp-ffbe529eeac7.tar.bz2 2737160 SHA256 c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb SHA512 1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493 WHIRLPOOL e85c5840883eaef4b1ebbb2dd0bae7d82457e01b6591653ac8d2d12a045f0736cb85b4c056a33614df7bb3b63cd61cf9e7caecdb5dae5f1d6be4f7ed1456cb53
DIST icedtea-2.6-jaxws-b9776fab65b8.tar.bz2 2021243 SHA256 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f SHA512 0d5fc0001571381d151033b4e8ca98658bed3943c34faafc73ffea2d537d44b433ad49e246fc00335828418fc6e1c40d75fd1ee2280ebf0bf4014b4551f80bb0 WHIRLPOOL f35173656c30525678a1a09a5b30ef019816ee006e7c0682c3852df7a92523eef28b936418805d6dc874a31db3d3ddd1d02938227a8ba6b9080d17239c68ff74
DIST icedtea-2.6-jdk-61d3e001dee6.tar.bz2 32421128 SHA256 a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363 SHA512 d5921683a63cca12fb73224ddd248ae37a986af1f9df131a130fb6f2f808631730298770382a90468b136c2bedb699985d129acb7e0fa2de662ab7543bcfba4c WHIRLPOOL 17d84d00f39774e08ba2934fd3e59cf5a372d0a8180576b2dbe6add617f36482cbd31f6d982e0b50b27fea54b9d35aec8552ab8d399cf7bd75047d4e55c1356d
DIST icedtea-2.6-langtools-9c6e1de67d7d.tar.bz2 1710699 SHA256 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43 SHA512 38136bba4d52b8de60e9a38f6ad47253d7513e46d82830ebb8f2f8659f66f99b7e3d7c4ad31c604cc5c516f1de331f2cdaf0ab0b37cff1dfd327c25ccc0f246f WHIRLPOOL 697447e27419d265a4e3f178f665ba59ba11ae0865acb4133c3e20096501b119b10c566c3a15ab5bd8b83a96fa48de36ca7be41cab92cff73c2e269e470bf333
DIST icedtea-2.6-openjdk-39b2c4354d0a.tar.bz2 129720 SHA256 0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f SHA512 b17315b58d6662953f7a6d73eb222a5a81165f55bed2f48f3d3915a169e8c8e503b5f22c59fce5cd3202ed2392f946f8701d9cff92d235ae44696d370f2efd28 WHIRLPOOL 5f14c467228f0a96c4b2e9b67a64836d871fbbfa13daec5b77adb8b39d8db4d20d18130f548c838826d58523f1cdc7972744ddbb564d07dc0fe27f6fa456a629
DIST icedtea-2.6.1.tar.xz 2049108 SHA256 cce4fac1e729690e986ef6f6d1c47b507f622a61da33d57d2b0a8c12e23e2068 SHA512 b465a025cd44c5395b43067042882cf272f5a9c71f06380a9bc4dedbd5e99c512161c84eaad8175aeb87d0477cd568aca4968862f02b9bd969736d2ee904b990 WHIRLPOOL 682dc4e4b14a604b1f30bf4a315ec56e91fddb72445dfe4110517e0e0dc5c4deb68565accf0600e6959febd818161078f1c65cf74a87e848c803820afce2bdb1
DIST icedtea-2.6-corba-a4d55c5cec23.tar.bz2 1072249 SHA256 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af SHA512 819974b10fe3d0ba15e45da843b3bc908e7caafb9fe264c43026bfa1a10daecef6e4cf23bd486f89cae0d6952ef812a170cf297a934679fc6dec29ca941c4826 WHIRLPOOL 69317e8f7d426cd338a1c698251b17bd6dc27d5010288cfacc008c3029b1ababc66541c4af6c5b8c12e5755503dd50e36dc4ab173851811bc3162b7d59f55bd5
DIST icedtea-2.6-hotspot-f40363c11191.tar.bz2 8164274 SHA256 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a SHA512 37c80f977b22e6cab2bda5c2f579f016feb0f910bc5c7b4426f22983e74eb53c6b495681301cfd60e0773034c93ca2a60af512275cff4851a2857c2eb338b769 WHIRLPOOL 0c914f92902b982a0a85dae119d33cfd0485a025f80e0f2442c817e658341ac7bc8ab2b4e512a67aaf33027e0bf378386925f498d7400054cf80ec4efeac66b3
DIST icedtea-2.6-jaxp-f1202fb27695.tar.bz2 2733459 SHA256 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0 SHA512 d0aa1a744b3f5522fe2264af26766a3945d7b5e4555b229a9f837b457bafe068111fdae6ac3d7349ce8907e0b1c747a0b31a11936e4794f646b5827cca5cde0c WHIRLPOOL f447ad445ea9abc5dffd3c49da50ca1063f59bfdaedb4702bcc48a6bfe217794cc8eae16f2cdfc8fb455104f47f6cccb40dbcf959077a9d33f1d34f18901e920
DIST icedtea-2.6-jaxws-14c411b1183c.tar.bz2 2022452 SHA256 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4 SHA512 3dd649f7565a449e831f14c2242e0fe9126f62380aa166bff627557774656c1604f8512ec93ec3ae243a851000b0fc014767de8ad58df8bb8892c88b8465d0e0 WHIRLPOOL 41665b394fc3ba3657e61cb3f45c43bfdce3e9c9a44f0a68ddc25bf19994c275da43c1f3b01f0fe96ff63d27901a529ff10183fa0d7c28196af3d8d08570a059
DIST icedtea-2.6-jdk-db69ae53157a.tar.bz2 32431054 SHA256 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1 SHA512 8107583bd87227460d030f0cab87d526e8aa097f073ccedb21eb634affc9e22ae908b722d92f9c9357d2d3f50c65a48a9f5b62cd86845dbdfd37bbc0750edff2 WHIRLPOOL 36a2cb4a23bbf14683c65c53b30dff1af9858d45a25a2bb55e4308d30d6042de3d27875c9fdc8a8a56b8fe707da437469ebbad07868061bd8ccad97853a0a66a
DIST icedtea-2.6-langtools-73356b81c5c7.tar.bz2 1710526 SHA256 a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335 SHA512 e049b6ec3abf28de05e96c882add05e87ea2edb75219e94739e4ea2e543166c9a663be43a2c2c82c95fe14b457eb675b8d1b96a4a289888941cd0b1b67b7539a WHIRLPOOL 78346964728729d3b4bdd87b9dbd30097ee6ce68f5872ea1878c288aff31a9cac25120ab485cf4c94b6a0d3a2d825893cbeee99b9021fea0601bd0c2fdbf455e
DIST icedtea-2.6-openjdk-601ca7147b8c.tar.bz2 129844 SHA256 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49 SHA512 e3a61447569e39817e7c7ebf0a8fadaf0c708dfee2815a8f576b6d5fa91479ecf2f7fd30285b9d18c8286f3911f2ddc226d8f8da1219da8c2c80fa1fbf47607c WHIRLPOOL 8397f49988174b2027bcb3674981260d0e6651cded064baf8067820eb6dca6c12d0bceb94b86e83b856455b008a7ca517e04be5820dee4dec63a4b8397e07efd
DIST icedtea-2.6.2.tar.xz 2074196 SHA256 bee8565c507a484ea876b62474aec379ac0e434acb9de8213279f47e1fe22076 SHA512 30772a71b53afb5f6acfcf8e31fd8c2ce25d056669b82af0024fb3e6623e27cbcc158ab39c7157e78e11949389fe576e220d8f70f32d98456464b53d4ee2ed51 WHIRLPOOL 32028cbd37fcfc9d2f1378938e7a7d6a34d9c03295fbfa0ac7f02c9e9c32933a3668947b7fa0b260bfb73b381a5297bc3cef26657534aded62689c2d2621b99c
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4
DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684

@ -1,10 +0,0 @@
--- Makefile.in.orig 2015-07-22 14:54:37.116940780 -0700
+++ Makefile.in 2015-09-06 05:05:47.220000000 -0700
@@ -134,6 +134,7 @@
@WITH_RHINO_TRUE@ patches/rhino.patch
@BUILD_CACAO_TRUE@am__append_10 = \
+@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
@BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
@BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
@BUILD_CACAO_TRUE@ patches/cacao/armhf.patch \

@ -1,26 +1,26 @@
# HG changeset patch
# User James Le Cuirot <chewi@gentoo.org>
# Date 1441543564 -3600
# Sun Sep 06 13:46:04 2015 +0100
# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
# Date 1441541110 -3600
# Sun Sep 06 13:05:10 2015 +0100
# Node ID 80e5553df66e3abb3680f747cbb8e32b394b4211
# Parent 468081e3e037df27b6427aa298dfaaa20f4ba4bf
Dynamically set the maximum heap size on Linux
diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
--- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
@@ -33,6 +33,10 @@
#include <errno.h>
#include <stdlib.h>
diff -r 468081e3e037 -r 80e5553df66e src/vm/vm.cpp
--- cacao/cacao/src/vm/vm.cpp Wed Jun 10 19:52:58 2015 +0200
+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:05:10 2015 +0100
@@ -32,6 +32,10 @@
#include <stdint.h>
#include <inttypes.h>
+#if defined(__LINUX__)
+#include <unistd.h>
+#endif
+
#include "vm/types.h"
#include "md-abi.hpp"
#include "arch.h"
@@ -702,6 +706,19 @@
#include "mm/codememory.hpp"
@@ -690,6 +694,19 @@
opt_heapstartsize = HEAP_STARTSIZE;
opt_stacksize = STACK_SIZE;
@ -38,5 +38,5 @@ diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+#endif
+
// First of all, parse the -XX options.
options_xx(vm_args);
#if defined(ENABLE_VMLOG)

@ -1,201 +0,0 @@
# HG changeset patch
# User andrew
# Date 1438275152 -3600
# Node ID a2334007f1a8504d2bd4a2c2a037732c289649c3
# Parent ab23850139cb2c666e613010842a1f984b184a3a
PR2568: openjdk causes a full desktop crash on RHEL 6 i586
Summary: Re-apply "8025775: JNI warnings in TryXShmAttach"; some changes lost in bad merge changeset 4b26f93b23ba
diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XConstants.java
--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Oct 23 10:50:34 2013 +0200
+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Thu Jul 30 17:52:32 2015 +0100
@@ -699,9 +699,4 @@
public static final long XkbModifierMapMask = (1L<<2);
public static final long XkbVirtualModsMask = (1L<<6); //server map
- /*****************************************************************
- * X SHARED MEMORY EXTENSION FUNCTIONS
- *****************************************************************/
-
- public static final int X_ShmAttach = 1;
}
diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XErrorHandler.java
--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Wed Oct 23 10:50:34 2013 +0200
+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Thu Jul 30 17:52:32 2015 +0100
@@ -41,29 +41,6 @@
return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
}
}
-
- /**
- * This is a base synthetic error handler containing a boolean flag which allows
- * to show that an error is handled or not.
- */
- public static class XErrorHandlerWithFlag extends XBaseErrorHandler {
- private volatile boolean errorOccurred = false;
-
- public boolean getErrorOccurredFlag() {
- return errorOccurred;
- }
-
- /**
- * Sets an internal boolean flag to a particular value. Should be always called
- * with {@code false} value of the parameter {@code errorOccurred} before this
- * error handler is set as current.
- * @param errorOccurred {@code true} to indicate that an error was handled,
- * {@code false} to reset the internal boolean flag
- */
- public void setErrorOccurredFlag(boolean errorOccurred) {
- this.errorOccurred = errorOccurred;
- }
- }
/*
* Instead of validating window id, we simply call XGetWindowProperty,
@@ -99,75 +76,4 @@
return theInstance;
}
}
-
- /**
- * This is a synthetic error handler for errors generated by the native function
- * {@code XShmAttach}. If an error is handled, an internal boolean flag of the
- * handler is set to {@code true}.
- */
- public static final class XShmAttachHandler extends XErrorHandlerWithFlag {
- private XShmAttachHandler() {}
-
- @Override
- public int handleError(long display, XErrorEvent err) {
- if (err.get_minor_code() == XConstants.X_ShmAttach) {
- setErrorOccurredFlag(true);
- return 0;
- }
- return super.handleError(display, err);
- }
-
- // Shared instance
- private static XShmAttachHandler theInstance = new XShmAttachHandler();
- public static XShmAttachHandler getInstance() {
- return theInstance;
- }
- }
-
- /**
- * This is a synthetic error handler for {@code BadAlloc} errors generated by the
- * native {@code glX*} functions. Its internal boolean flag is set to {@code true},
- * if an error is handled.
- */
- public static final class GLXBadAllocHandler extends XErrorHandlerWithFlag {
- private GLXBadAllocHandler() {}
-
- @Override
- public int handleError(long display, XErrorEvent err) {
- if (err.get_error_code() == XConstants.BadAlloc) {
- setErrorOccurredFlag(true);
- return 0;
- }
- return super.handleError(display, err);
- }
-
- private static GLXBadAllocHandler theInstance = new GLXBadAllocHandler();
- public static GLXBadAllocHandler getInstance() {
- return theInstance;
- }
- }
-
- /**
- * This is a synthetic error handler for errors generated by the native function
- * {@code XChangeWindowAttributes}. If an error is handled, an internal boolean
- * flag of the handler is set to {@code true}.
- */
- public static final class XChangeWindowAttributesHandler extends XErrorHandlerWithFlag {
- private XChangeWindowAttributesHandler() {}
-
- @Override
- public int handleError(long display, XErrorEvent err) {
- if ((err.get_request_code() == XProtocolConstants.X_ChangeWindowAttributes) &&
- (err.get_error_code() == XConstants.BadAccess)) {
- setErrorOccurredFlag(true);
- return 0;
- }
- return super.handleError(display, err);
- }
-
- private static XChangeWindowAttributesHandler theInstance = new XChangeWindowAttributesHandler();
- public static XChangeWindowAttributesHandler getInstance() {
- return theInstance;
- }
- }
}
diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_GraphicsEnv.h
--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Wed Oct 23 10:50:34 2013 +0200
+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Thu Jul 30 17:52:32 2015 +0100
@@ -54,7 +54,7 @@
void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
void resetXShmAttachFailed();
-jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo);
+jboolean isXShmAttachFailed();
#endif /* MITSHM */
diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_xembed_server.c
--- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Wed Oct 23 10:50:34 2013 +0200
+++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Thu Jul 30 17:52:32 2015 +0100
@@ -644,19 +644,12 @@
return dim;
}
-Boolean isMapped(JNIEnv* env, Window w) {
+Boolean isMapped(Window w) {
XWindowAttributes attr;
Status status = 0;
- jboolean errorOccurredFlag;
- jobject errorHandlerRef;
- jobject savedError;
- unsigned char xerror_code;
-
- EXEC_WITH_XERROR_HANDLER(env, "sun/awt/X11/XErrorHandler$IgnoreBadWindowHandler",
- "()Lsun/awt/X11/XErrorHandler$IgnoreBadWindowHandler;", JNI_FALSE,
- errorHandlerRef, errorOccurredFlag,
- status = XGetWindowAttributes(awt_display, w, &attr));
- xerror_code = GET_XERROR_CODE(env, savedError);
+ WITH_XERROR_HANDLER(xerror_ignore_bad_window);
+ status = XGetWindowAttributes(awt_display, w, &attr);
+ RESTORE_XERROR_HANDLER;
if (status == 0 || xerror_code != Success) {
return False;
}
@@ -692,7 +685,7 @@
sdata->version = *data;
flags = *(data+1);
new_mapped = (flags & XEMBED_MAPPED) != 0;
- currently_mapped = isMapped(env, sdata->handle);
+ currently_mapped = isMapped(sdata->handle);
if (new_mapped != currently_mapped) {
if (new_mapped) {
XMapWindow(awt_display, sdata->handle);
diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/java2d/x11/X11SurfaceData.c
--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Wed Oct 23 10:50:34 2013 +0200
+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Thu Jul 30 17:52:32 2015 +0100
@@ -551,8 +551,6 @@
{
XImage *img = NULL;
XShmSegmentInfo *shminfo;
- JNIEnv* env;
- jboolean xShmAttachResult;
shminfo = malloc(sizeof(XShmSegmentInfo));
if (shminfo == NULL) {
@@ -603,7 +601,7 @@
*/
shmctl(shminfo->shmid, IPC_RMID, 0);
- if (xShmAttachResult == JNI_FALSE) {
+ if (isXShmAttachFailed() == JNI_TRUE) {
J2dRlsTraceLn1(J2D_TRACE_ERROR,
"X11SD_SetupSharedSegment XShmAttach has failed: %s",
strerror(errno));

@ -1,442 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
# *********************************************************
EAPI="5"
SLOT="7"
inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-4)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
CORBA_TARBALL="a146d87ff390.tar.bz2"
JAXP_TARBALL="3d9457280537.tar.bz2"
JAXWS_TARBALL="bc5d03e92fd3.tar.bz2"
JDK_TARBALL="48b2e510f78e.tar.bz2"
LANGTOOLS_TARBALL="a6d3d79b4547.tar.bz2"
OPENJDK_TARBALL="44f140fd2873.tar.bz2"
HOTSPOT_TARBALL="383de087ee57.tar.bz2"
AARCH64_TARBALL="b19bc5aeaa09.tar.bz2"
CACAO_TARBALL="e215e36be9fc.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
DROP_URL="http://icedtea.classpath.org/download/drops"
ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
HOMEPAGE="http://icedtea.classpath.org"
SRC_PKG="${ICEDTEA_PKG}.tar.xz"
SRC_URI="
http://icedtea.classpath.org/download/source/${SRC_PKG}
${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
!arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} ) )
${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
KEYWORDS="~ppc"
RESTRICT="test"
IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
pulseaudio selinux smartcard source +sunec test zero +webstart"
REQUIRED_USE="gtk? ( awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
>=media-libs/alsa-lib-1.0"
CUPS_COMMON_DEP="
>=net-print/cups-1.2.12"
X_COMMON_DEP="
>=media-libs/giflib-4.1.6:=
>=media-libs/libpng-1.2:0=
>=x11-libs/libX11-1.1.3
>=x11-libs/libXext-1.1.1
>=x11-libs/libXi-1.1.3
>=x11-libs/libXrender-0.9.4
>=x11-libs/libXtst-1.0.3
x11-libs/libXt"
X_DEPEND="
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXinerama-1.0.2
x11-proto/inputproto
>=x11-proto/xextproto-7.1.1
x11-proto/xineramaproto
x11-proto/xproto"
COMMON_DEP="
>=dev-libs/glib-2.26:2
>=dev-util/systemtap-1
media-libs/fontconfig
>=media-libs/freetype-2.5.3:2=[infinality?]
>=media-libs/lcms-2.5
>=sys-libs/zlib-1.2.3:=
virtual/jpeg:0=
gtk? (
>=dev-libs/atk-1.30.0
>=x11-libs/cairo-1.8.8:=
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.8:2=
>=x11-libs/pango-1.24.5
)
javascript? ( dev-java/rhino:1.6 )
kerberos? ( virtual/krb5 )
nss? ( >=dev-libs/nss-3.12.5-r1 )
smartcard? ( sys-apps/pcsc-lite )
sunec? ( >=dev-libs/nss-3.16.1-r1 )"
# gsettings-desktop-schemas is needed for native proxy support. #431972
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
!dev-java/icedtea-web:7
>=gnome-base/gsettings-desktop-schemas-3.12.2
media-fonts/dejavu
alsa? ( ${ALSA_COMMON_DEP} )
awt? ( ${X_COMMON_DEP} )
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
media-fonts/lklug
media-fonts/lohit-fonts
media-fonts/sazanami
)
cups? ( ${CUPS_COMMON_DEP} )
selinux? ( sec-policy/selinux-java )"
# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
# ca-certificates, perl and openssl are used for the cacerts keystore generation
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|| (
>=dev-java/gcj-jdk-4.3
dev-java/icedtea-bin:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
app-arch/cpio
app-arch/unzip
app-arch/zip
app-misc/ca-certificates
>=dev-java/ant-core-1.8.2
dev-lang/perl
>=dev-libs/libxslt-1.1.26
dev-libs/openssl
sys-apps/attr
sys-apps/lsb-release
virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
icedtea_check_requirements() {
local CHECKREQS_DISK_BUILD
if use doc; then
CHECKREQS_DISK_BUILD="9000M"
else
CHECKREQS_DISK_BUILD="8500M"
fi
check-reqs_pkg_${EBUILD_PHASE}
}
pkg_pretend() {
icedtea_check_requirements
}
pkg_setup() {
icedtea_check_requirements
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7
icedtea-6 icedtea-bin-6
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${SRC_PKG}
}
java_prepare() {
# CACAO has a fixed default max heap of 128MB. This sucks.
cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
if ! use cups; then
# CUPS is always needed at build time but you can at least make it dlopen.
sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
fi
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
}
src_configure() {
local cacao_config config hotspot_port hs_tarball jamvm_config use_cacao use_jamvm use_zero zero_config
local vm=$(java-pkg_get-current-vm)
# gcj-jdk ensures ecj is present.
if use jbootstrap || has "${vm}" gcj-jdk; then
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
config+=" --enable-bootstrap"
else
config+=" --disable-bootstrap"
fi
# Use Zero if requested
if use zero; then
use_zero="yes"
fi
# Use JamVM if requested
if use jamvm; then
use_jamvm="yes"
fi
# Use CACAO if requested
if use cacao; then
use_cacao="yes"
fi
# Are we on a architecture with a HotSpot port?
# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
hotspot_port="yes"
fi
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use CACAO on ppc and Zero on anything else
if test "x${hotspot_port}" != "xyes"; then
if use ppc; then
use_cacao="yes"
else
use_zero="yes"
fi
fi
# Turn on JamVM if needed (non-HS archs) or requested
if test "x${use_jamvm}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
ewarn 'If so, please rebuild with USE="-jamvm"'
fi
jamvm_config="--enable-jamvm"
fi
# Turn on CACAO if needed (non-HS archs) or requested
if test "x${use_cacao}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
ewarn 'If so, please rebuild with USE="-cacao"'
fi
cacao_config="--enable-cacao"
fi
# Turn on Zero if needed (non-HS/CACAO archs) or requested
if test "x${use_zero}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
fi
zero_config="--enable-zero"
fi
# Use appropriate HotSpot tarball for architecture
if { use arm || use arm64; }; then
hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}";
else
hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}";
fi
config+=" --with-parallel-jobs=$(makeopts_jobs)"
if use javascript ; then
config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
else
config+=" --without-rhino"
fi
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
econf ${config} \
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
--with-hotspot-src-zip="${hs_tarball}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
--with-jdk-home="$(java-config -O)" \
--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
--with-pkgversion="Gentoo ${PF}" \
--disable-downloading --disable-Werror \
--disable-hotspot-tests --disable-jdk-tests \
--enable-system-lcms --enable-system-jpeg \
--enable-system-zlib \
$(use_enable awt system-gif) \
$(use_enable awt system-png) \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_enable gtk system-gtk) \
$(use_enable infinality) \
$(use_enable kerberos system-kerberos) \
$(use_enable nss) \
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
$(use_enable smartcard system-pcsc) \
$(use_enable sunec) \
${zero_config} ${cacao_config} ${jamvm_config}
}
src_compile() {
# Would use GENTOO_VM otherwise.
export ANT_RESPECT_JAVA_HOME=TRUE
# With ant >=1.8.2 all required tasks are part of ant-core
export ANT_TASKS="none"
emake
}
src_test() {
# Use Xvfb for tests
unset DISPLAY
Xemake check
}
src_install() {
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}${dest#/}"
dodir "${dest}"
dodoc README NEWS AUTHORS
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
cd openjdk.build/j2sdk-image || die
if ! use alsa; then
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
fi
if ! use awt; then
rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
{,jre/}bin/policytool bin/appletviewer || die
fi
# Don't hide classes
rm lib/ct.sym || die
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# doins doesn't preserve executable bits.
cp -vRP bin include jre lib man "${ddest}" || die
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
if use doc; then
docinto html
dodoc -r ../docs/*
fi
if use examples; then
cp -vRP demo sample "${ddest}" || die
fi
if use source; then
cp src.zip "${ddest}" || die
fi
# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
if use webstart || use nsplugin; then
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
fi
if use webstart; then
dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
fi
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
# Needs to be done before generating cacerts
java-vm_set-pax-markings "${ddest}"
# We need to generate keystore - bug #273306
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
mkdir "${T}/certgen" && cd "${T}/certgen" || die
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
openssl x509 -text -in "${c}" >> all.crt || die
done
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
# install it anyway. Bug 390663
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
eprefixify "${T}"/fontconfig.Gentoo.properties
insinto "${dest}"/jre/lib
doins "${T}"/fontconfig.Gentoo.properties
set_java_env "${FILESDIR}/icedtea.env"
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-7.2.0:7"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea7"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
elog "If you had icedtea7 as system VM, the change should be automatic, however"
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
fi
}

@ -16,13 +16,13 @@ ICEDTEA_VER=$(get_version_component_range 2-4)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
CORBA_TARBALL="2545636482d6.tar.bz2"
JAXP_TARBALL="ffbe529eeac7.tar.bz2"
JAXWS_TARBALL="b9776fab65b8.tar.bz2"
JDK_TARBALL="61d3e001dee6.tar.bz2"
LANGTOOLS_TARBALL="9c6e1de67d7d.tar.bz2"
OPENJDK_TARBALL="39b2c4354d0a.tar.bz2"
HOTSPOT_TARBALL="b19bc5aeaa09.tar.bz2"
CORBA_TARBALL="a4d55c5cec23.tar.bz2"
JAXP_TARBALL="f1202fb27695.tar.bz2"
JAXWS_TARBALL="14c411b1183c.tar.bz2"
JDK_TARBALL="db69ae53157a.tar.bz2"
LANGTOOLS_TARBALL="73356b81c5c7.tar.bz2"
OPENJDK_TARBALL="601ca7147b8c.tar.bz2"
HOTSPOT_TARBALL="f40363c11191.tar.bz2"
CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@ -57,14 +57,14 @@ SRC_URI="
${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
RESTRICT="test"
IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
REQUIRED_USE="gtk? ( awt )"
REQUIRED_USE="gtk? ( !headless-awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@ -118,7 +118,6 @@ RDEPEND="${COMMON_DEP}
>=gnome-base/gsettings-desktop-schemas-3.12.2
media-fonts/dejavu
alsa? ( ${ALSA_COMMON_DEP} )
awt? ( ${X_COMMON_DEP} )
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
@ -127,6 +126,7 @@ RDEPEND="${COMMON_DEP}
media-fonts/sazanami
)
cups? ( ${CUPS_COMMON_DEP} )
!headless-awt? ( ${X_COMMON_DEP} )
selinux? ( sec-policy/selinux-java )"
# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
@ -264,6 +264,10 @@ src_configure() {
ewarn 'If so, please rebuild with USE="-cacao"'
fi
cacao_config="--enable-cacao"
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
fi
# Turn on Zero if needed (non-HS/CACAO archs) or requested
@ -284,10 +288,6 @@ src_configure() {
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
# https://bugs.gentoo.org/show_bug.cgi?id=561500
ln -s "${FILESDIR}/TryXShmAttach.patch" || die
export DISTRIBUTION_PATCHES="TryXShmAttach.patch"
econf ${config} \
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
@ -308,8 +308,8 @@ src_configure() {
--disable-hotspot-tests --disable-jdk-tests \
--enable-system-lcms --enable-system-jpeg \
--enable-system-zlib \
$(use_enable awt system-gif) \
$(use_enable awt system-png) \
$(use_enable !headless-awt system-gif) \
$(use_enable !headless-awt system-png) \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_enable gtk system-gtk) \
@ -350,7 +350,7 @@ src_install() {
rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
fi
if ! use awt; then
if use headless-awt; then
rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
"${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
fi

@ -17,6 +17,7 @@
<use>
<flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
<flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="infinality">Enable better font rendering using fontconfig.</flag>
<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>

@ -2,5 +2,5 @@ DIST vala-0.20.1.tar.xz 2627808 SHA256 9cb7ecd18a23525e401c204d4d08341c7d911cd5d
DIST vala-0.22.1.tar.xz 2690324 SHA256 92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c SHA512 e65f6d368d50264cdd497251ca6ebf8f0be21455afe5b9d74b146d58229f32e5906cfe323cef2cf4c6677e01fcbf599ab98852d4930df89cb69740b8fffacb34 WHIRLPOOL d3252642b35ab619f3b08dbda3ab4ef201b665c55682e122b4ffd1e5138d60a38b017ae20140de31372c9f61f20532a7a04d77f8cfe5ae04f93ea1c55338e09a
DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc
DIST vala-0.28.0.tar.xz 2720652 SHA256 0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f SHA512 4f9adc4a3e672c25b508f5193bb1984e848dcaca059c2eb733e93ca7f58b5d58028a56f4234a62baa30ff50b63d87af24510334eba41630692c5f16e580bad88 WHIRLPOOL cfdd97f90f033b030d768ed66e78b5f86b6e1e50bac34806cd70dda168a5ff3192249d08ee9e020e0ea33d753b20aa69c6e269c65fa193a19e6ae4353912c7d2
DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4
DIST vala-0.30.0.tar.xz 2725736 SHA256 61f0337b000f7ed6ef8c1fea87e0047d9bd7c0f91dd9c5b4eb70fd3fb883dedf SHA512 2c2cf53ae7f350ab42d2ebe75802b8bc2eff474f2e0e0e4c817d44b2a7cf958619732bd04d109ed34b86a94816564c856fe09e18e982a35e523f937820c1cef7 WHIRLPOOL 53428587f1fbd017de3649ddcf312fd4858d7a75f5f397284ae12911f745c0e0b85bb4b815555413b5135507fd32ce3042b8fc58d9c1cf63ab641c7997ad01fd

@ -11,7 +11,7 @@ DESCRIPTION="Compiler for the GObject type system"
HOMEPAGE="https://wiki.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.28"
SLOT="0.30"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="test"

@ -1,3 +1,4 @@
DIST appstream-glib-0.3.4.tar.xz 1814472 SHA256 97b948ad992cb985e5bed533446fb5d23632397cfe2833034e11d4c6b47199da SHA512 e128609980512a4975f1226dc41300480c43f311611ac935973e850a53562f7c770622239d4dd1a2ccd88430c2a305c64927a507125f6d7761c04d8ecf0ab502 WHIRLPOOL f80edc738ca5e07255625cc4322d483c2ae753e06d1f84eed1755239c2f87aff0fd13a60bd7bae2e4f4ffecc2760a6c301e98dd085a157448e89fcd91d6e614d
DIST appstream-glib-0.4.0.tar.xz 1837552 SHA256 f4dee0e86549009f248d38eb643061e82ff0d542f06e1f4af6b36af2f97c2e13 SHA512 54769b47f11f8792ee85ab0922d8a256800c00558ca9e2fcaab30845e3fbd9f4a08d311608f0b600f8ad070d79d5227cd9ac4b644ef6d94e1772e4695c4f1afe WHIRLPOOL da036564be55acc4c0b3d5320f165ac98d6f4754ed74dda8b06d31c7bfd91b10ff3f4ff0d85b141bfa804391befcadecd714a9b110d422cf9286c899714ad58d
DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d98dadcd99d7271fb319f6279b846bf36 SHA512 1c1a1f41d6911c73a25a83396fb183d99ee139378766235b8885ee68c2b738137d55c108e7ea3ec2853e5ac5f17936b87df554bea45a1c19db3caea5bcee5d0d WHIRLPOOL 2a26ce1685ed3c78242c0ef29b4e5dea95ba070e531503f00f378f36974a8e1aa858b66640fe48ccc7c1ace9619671ff3c6d71aaf78e81a6ef5b55ab2be64090
DIST appstream-glib-0.5.3.tar.xz 1853508 SHA256 842688933d182c4789843f0d7b288622a9fd3f75fbe645849cacc6195bdfceab SHA512 18ff35dcaed26072c0c3f84dc7310f1838e0626f733d2bf7cb8aeb7e36a963fa07a9b2c917e7cb423a5fab1b329977ff9ec8836be9c3a988724a624d4d77f4a8 WHIRLPOOL d8c10c5e669cb2d52c55217fe97e08f6b29119a57254d63df9187ea82fb98b174345b8a4e314b548e8f40cf2066a3d42ae189a3e89199e14d60f5f8a6f0f2c54

@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/7"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection nls"
# FIXME: yaml is optional with --enable-dep11 but not

@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/8" # soname version
KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
IUSE="+introspection nls"
# FIXME: yaml is optional with --enable-dep11 but not

@ -0,0 +1,62 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit bash-completion-r1 gnome2
DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
HOMEPAGE="http://people.freedesktop.org/~hughsient/appstream-glib/"
SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/8" # soname version
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection nls"
# FIXME: yaml is optional with --enable-dep11 but not
# properly handled in autofoo bug#????
RDEPEND="
app-arch/gcab
app-arch/libarchive
dev-db/sqlite:3
>=dev-libs/glib-2.45.8:2
>=media-libs/fontconfig-2.11
>=media-libs/freetype-2.4:2
>=net-libs/libsoup-2.51.92:2.4
>=x11-libs/gdk-pixbuf-2.31.5:2
x11-libs/gtk+:3
x11-libs/pango
dev-libs/libyaml
introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.3
dev-libs/libxslt
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.40
>=sys-devel/gettext-0.17
"
# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
# are migrated to appstream-glib
RDEPEND="${RDEPEND}
!<dev-util/appdata-tools-0.1.8-r1
"
PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
src_configure() {
gnome2_src_configure \
--enable-builder \
--enable-firmware \
--disable-ostree \
--disable-rpm \
--disable-static \
--enable-dep11 \
--enable-man \
$(use_enable nls) \
$(use_enable introspection) \
--with-bashcompletiondir="$(get_bashcompdir)"
}

@ -1,2 +1,2 @@
DIST gdl-3.14.0.tar.xz 537916 SHA256 4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db SHA512 f602350e699ff539cb6f6523566653ce50d19b02a5490a4489bf94ef3e7904a64b97f2876745b42485266077bbe520383b765b45c9a2dfab5f42dff37c2323b5 WHIRLPOOL 6c8710c10cf866b3ea7653d2101e6c98cef22301206bc3b73ee91618d57c3e8e12c91e77c6e55d5b2f65124c8ad4ba33c94d1a51e6b3b648713870a30eae8537
DIST gdl-3.16.0.tar.xz 527328 SHA256 34cbe104f5df9a20ea26aa8acca2b6d1a73035448aa854162c598e90f4e6ff80 SHA512 77a54a7ae1603f942e7f0731c76907a8e1f4fd1d20e27e13c365fd2f6130e2331ca3d467dccea032a5ac0303035df58271849f2f4e32df8f037868fd24351a94 WHIRLPOOL ca51eb143146b6bb380ee76ce3cfc7b7e4b1bff317d49045ec00e8f994034d947f1b2cae2590f9e891b88d57bac78ad08042f6d5bceb34f2f7c30e1572873dd0
DIST gdl-3.18.0.tar.xz 527728 SHA256 1499884e4fce375a963cf2b98b90e6724144f9b1f1ac8b84d765f4c85a2140b2 SHA512 6ef634242a53c8ae8610305a3ee1dbb61867f974fc1b3922404cd7f01ff95ac2ffa3ce3c5c5fc6bc327f7973f7c2ca401e7c29d3dcf0e98716e3848a85360d45 WHIRLPOOL 28fe56651e64f06444f590cb057dc57e48cd86b90c90a662115d50b276615ee2c694dc2ca92ddc97123eb9fbe14f70345eec9d82adec7744b42d5bc4d82b07ad

@ -8,18 +8,18 @@ GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="GNOME docking library"
HOMEPAGE="https://developer.gnome.org/gdl/"
HOMEPAGE="https://git.gnome.org/browse/gdl"
LICENSE="LGPL-2.1+"
SLOT="3/5" # subslot = libgdl-3 soname version
IUSE="+introspection"
KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
RDEPEND="
dev-libs/glib:2
>=x11-libs/gtk+-3.0.0:3[introspection?]
>=dev-libs/libxml2-2.4:2
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.4

@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk test"
KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
RDEPEND="
>=dev-libs/glib-2.36:2

@ -1,6 +1,6 @@
DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486

@ -1,66 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
inherit autotools libtool flag-o-matic eutils portability
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz
mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2"
LICENSE="LGPL-2.1+"
SLOT="1"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="hardened"
DEPEND=""
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${P}-automake.patch
epatch "${FILESDIR}"/${P}-m4.patch
epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
# Allow glib to build with gcc-3.4.x #47047
epatch "${FILESDIR}"/${P}-gcc34-fix.patch
# Fix for -Wl,--as-needed (bug #133818)
epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
# build failure with automake-1.13
epatch "${FILESDIR}/${P}-automake-1.13.patch"
use ppc64 && use hardened && replace-flags -O[2-3] -O1
append-ldflags $(dlopen_lib)
rm -f acinclude.m4 #168198
eautoreconf
elibtoolize
}
src_configure() {
# Bug 48839: pam fails to build on ia64
# The problem is that it attempts to link a shared object against
# libglib.a; this library needs to be built with -fPIC. Since
# this package doesn't contain any significant binaries, build the
# whole thing with -fPIC (23 Apr 2004 agriffis)
append-flags -fPIC
econf \
--with-threads=posix \
--enable-debug=yes
}
src_install() {
default
dodoc AUTHORS ChangeLog README* INSTALL NEWS
dohtml -r docs
cd "${D}"/usr/$(get_libdir) || die
chmod 755 libgmodule-1.2.so.*
}

@ -32,7 +32,7 @@ REQUIRED_USE="
test? ( ${PYTHON_REQUIRED_USE} )
"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
RDEPEND="
!<dev-util/gdbus-codegen-${PV}

@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
# adding new dependencies end up making stage3 to grow. Every addition needs
# then to be think very closely.
EAPI="5"
PYTHON_COMPAT=( python2_7 )
# Building with --disable-debug highly unrecommended. It will build glib in
@ -22,33 +26,30 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2+"
SLOT="2"
IUSE="fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
REQUIRED_USE="
utils? ( ${PYTHON_REQUIRED_USE} )
test? ( ${PYTHON_REQUIRED_USE} )
"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
RDEPEND="
!<dev-util/gdbus-codegen-${PV}
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|| (
>=dev-libs/elfutils-0.142
>=dev-libs/libelf-0.8.12
>=sys-freebsd/freebsd-lib-9.2_rc1
)
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
utils? (
${PYTHON_DEPS}
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
|| (
>=dev-libs/elfutils-0.142
>=dev-libs/libelf-0.8.12
>=sys-freebsd/freebsd-lib-9.2_rc1
)
)
"
DEPEND="${RDEPEND}
@ -68,13 +69,13 @@ DEPEND="${RDEPEND}
# different g-i and glib major versions
PDEPEND="!<gnome-base/gvfs-1.6.4-r990
dbus? ( gnome-base/dconf )
mime? ( x11-misc/shared-mime-info )
"
# shared-mime-info needed for gio/xdgmime, bug #409481
# dconf is needed to be able to save settings, bug #498436
# Earlier versions of gvfs do not work with glib
#DOCS="AUTHORS ChangeLog* NEWS* README"
pkg_setup() {
if use kernel_linux ; then
CONFIG_CHECK="~INOTIFY_USER"
@ -91,16 +92,7 @@ src_prepare() {
# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
# Upstream doesn't even know if this is needed, looks like openBSD
# people is not needing it
# epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
if use test; then
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
if ! has_version dev-util/desktop-file-utils ; then
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
@ -135,16 +127,15 @@ src_prepare() {
# Some tests need ipv6, upstream bug #667468
if [[ -n "${IPV6_DISABLED}" ]]; then
sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
fi
# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
# thread test fails, upstream bug #679306
epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
# FIXME: we need to check if it's still failing as upstream thinks something
# is wrong in our setups
#epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
# This test is prone to fail, bug #504024, upstream bug #723719
sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
@ -160,10 +151,6 @@ src_prepare() {
sed -e '/${PYTHON}/d' \
-i glib/Makefile.{am,in} || die
# Gentoo handles completions in a different directory
sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
gio/Makefile.am || die
epatch_user
# Also needed to prevent cross-compile failures, see bug #267603
@ -187,6 +174,19 @@ multilib_src_configure() {
export LIBFFI_LIBS="-lffi"
fi
# These configure tests don't work when cross-compiling.
if tc-is-cross-compiler ; then
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
case ${CHOST} in
hppa*|metag*) export glib_cv_stack_grows=yes ;;
*) export glib_cv_stack_grows=no ;;
esac
# https://bugzilla.gnome.org/show_bug.cgi?id=756474
export glib_cv_uscore=no
# https://bugzilla.gnome.org/show_bug.cgi?id=756475
export ac_cv_func_posix_get{pwuid,grgid}_r=yes
fi
local myconf
case "${CHOST}" in
@ -194,10 +194,9 @@ multilib_src_configure() {
*) myconf="${myconf} --with-threads=posix" ;;
esac
# Only used by the gresource bin
multilib_is_native_abi || myconf="${myconf} --disable-libelf"
# Always use internal libpcre, bug #254659
# FIXME: Always use internal libpcre, bug #254659
# (maybe consider going back to system lib)
# libelf used only by the gresource bin
ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
$(use_enable xattr) \
$(use_enable fam) \
@ -205,6 +204,7 @@ multilib_src_configure() {
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
$(multilib_native_use_enable utils libelf) \
--disable-compile-warnings \
--enable-man \
--with-pcre=internal \
@ -242,7 +242,7 @@ multilib_src_test() {
}
multilib_src_install() {
gnome2_src_install
gnome2_src_install completiondir="$(get_bashcompdir)"
}
multilib_src_install_all() {

@ -1,4 +1,3 @@
DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
DIST gobject-introspection-1.42.0.tar.xz 1308056 SHA256 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7 SHA512 2f84aae6ebb73f1cda70be6070fdbd0791777baed0f12921518a3c9cc890c406d6649bf0441bef5b93b6da4320d0c2639d9090c43d1011deebd1652f1e958021 WHIRLPOOL fe2703c82c83617093fa9ee74b28a2f6bec87d43f4b6eadf7f124a8454a817b6a30b635ea7c0388e429ae081f23c943ca31c34f2aa68811b1d4d10758b8a6a16
DIST gobject-introspection-1.44.0.tar.xz 1319168 SHA256 6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad SHA512 294bee6c935991620e6bfe4bd63d7b5c586079cdc9ac349dd5228f5822f86983a5a4518838c808c3fdd1152cb37f79db5ad8674245939ecad97459ce178f03e7 WHIRLPOOL fb032ae524bdbb011963c58e9d5d4a488fe89d95f2a353d0871176c26f1cb2f276743ec4bb97149f76135565965c173f149f163b78de47b994a5b4b32f3aa6aa
DIST gobject-introspection-1.46.0.tar.xz 1359436 SHA256 6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233 SHA512 2bdf988caadd6c4286ed90e35d26e1478d8ca627c8fb34f23d44473d0520f16b6082f0ee4f0acf44769bb5de2354119f2e28595ad8919668bebe5aec4c1ac210 WHIRLPOOL fb6c8570c41ebb06808e994811da2794ce3fe70ea1e5d50dcf2a4e72646efe8d49ce0ca176cecfc0bb6c9a3d7f47c13edd1c238b0e0e9649552793ff62145164

@ -1,34 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GNOME_ORG_MODULE="gobject-introspection"
inherit gnome.org
DESCRIPTION="Build infrastructure for GObject Introspection"
HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
LICENSE="HPND"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
# https://forums.gentoo.org/viewtopic-p-7421930.html
src_configure() { :; }
src_compile() { :; }
src_install() {
dodir /usr/share/aclocal
insinto /usr/share/aclocal
doins m4/introspection.m4
dodir /usr/share/gobject-introspection-1.0
insinto /usr/share/gobject-introspection-1.0
doins Makefile.introspection
}

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -12,7 +12,7 @@ HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
LICENSE="HPND"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"

@ -1,3 +1,3 @@
DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
DIST gobject-introspection-1.42.0.tar.xz 1308056 SHA256 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7 SHA512 2f84aae6ebb73f1cda70be6070fdbd0791777baed0f12921518a3c9cc890c406d6649bf0441bef5b93b6da4320d0c2639d9090c43d1011deebd1652f1e958021 WHIRLPOOL fe2703c82c83617093fa9ee74b28a2f6bec87d43f4b6eadf7f124a8454a817b6a30b635ea7c0388e429ae081f23c943ca31c34f2aa68811b1d4d10758b8a6a16
DIST gobject-introspection-1.44.0.tar.xz 1319168 SHA256 6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad SHA512 294bee6c935991620e6bfe4bd63d7b5c586079cdc9ac349dd5228f5822f86983a5a4518838c808c3fdd1152cb37f79db5ad8674245939ecad97459ce178f03e7 WHIRLPOOL fb032ae524bdbb011963c58e9d5d4a488fe89d95f2a353d0871176c26f1cb2f276743ec4bb97149f76135565965c173f149f163b78de47b994a5b4b32f3aa6aa
DIST gobject-introspection-1.46.0.tar.xz 1359436 SHA256 6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233 SHA512 2bdf988caadd6c4286ed90e35d26e1478d8ca627c8fb34f23d44473d0520f16b6082f0ee4f0acf44769bb5de2354119f2e28595ad8919668bebe5aec4c1ac210 WHIRLPOOL fb6c8570c41ebb06808e994811da2794ce3fe70ea1e5d50dcf2a4e72646efe8d49ce0ca176cecfc0bb6c9a3d7f47c13edd1c238b0e0e9649552793ff62145164

@ -1,484 +0,0 @@
From a4c9d09d7a89d3c80b4465a5c2ae0efa24158b24 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Tue, 6 May 2014 18:53:21 +0200
Subject: Parse and expose ownership transfer for instance parameters
Knowing the ownership transfer for instance parameters is
necessary for correct memory management of functions which
"eat" their instance argument, such as g_dbus_method_invocation_return_*.
Parse this information from the gir file and store in the
typelib, and then provide new API on GICallableInfo to
retrieve this.
https://bugzilla.gnome.org/show_bug.cgi?id=729662
diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c
index e69e3e9..702e16c 100644
--- a/girepository/gicallableinfo.c
+++ b/girepository/gicallableinfo.c
@@ -276,6 +276,32 @@ g_callable_info_get_caller_owns (GICallableInfo *info)
}
/**
+ * g_callable_info_get_instance_ownership_transfer:
+ * @info: a #GICallableInfo
+ *
+ * Obtains the ownership transfer for the instance argument.
+ * #GITransfer contains a list of possible transfer values.
+ *
+ * Returns: the transfer
+ */
+GITransfer
+g_callable_info_get_instance_ownership_transfer (GICallableInfo *info)
+{
+ GIRealInfo *rinfo = (GIRealInfo*) info;
+ SignatureBlob *blob;
+
+ g_return_val_if_fail (info != NULL, -1);
+ g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), -1);
+
+ blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
+
+ if (blob->instance_transfer_ownership)
+ return GI_TRANSFER_EVERYTHING;
+ else
+ return GI_TRANSFER_NOTHING;
+}
+
+/**
* g_callable_info_get_n_args:
* @info: a #GICallableInfo
*
diff --git a/girepository/gicallableinfo.h b/girepository/gicallableinfo.h
index 71f9d0c..f273d29 100644
--- a/girepository/gicallableinfo.h
+++ b/girepository/gicallableinfo.h
@@ -73,6 +73,8 @@ gboolean g_callable_info_invoke (GICallableInfo *info,
gboolean is_method,
gboolean throws,
GError **error);
+GITransfer g_callable_info_get_instance_ownership_transfer (GICallableInfo *info);
+
G_END_DECLS
diff --git a/girepository/girepository.symbols b/girepository/girepository.symbols
index 5f01adf..48fb0d9 100644
--- a/girepository/girepository.symbols
+++ b/girepository/girepository.symbols
@@ -26,6 +26,7 @@ g_info_new
g_callable_info_can_throw_gerror
g_callable_info_get_arg
g_callable_info_get_caller_owns
+g_callable_info_get_instance_ownership_transfer
g_callable_info_get_n_args
g_callable_info_get_return_attribute
g_callable_info_get_return_type
diff --git a/girepository/girnode.c b/girepository/girnode.c
index 53385c2..a7a77e3 100644
--- a/girepository/girnode.c
+++ b/girepository/girnode.c
@@ -1664,6 +1664,7 @@ _g_ir_node_build_typelib (GIrNode *node,
blob2->caller_owns_return_value = function->result->transfer;
blob2->caller_owns_return_container = function->result->shallow_transfer;
blob2->skip_return = function->result->skip;
+ blob2->instance_transfer_ownership = function->instance_transfer_full;
blob2->reserved = 0;
blob2->n_arguments = n;
@@ -1762,6 +1763,7 @@ _g_ir_node_build_typelib (GIrNode *node,
blob2->may_return_null = signal->result->nullable;
blob2->caller_owns_return_value = signal->result->transfer;
blob2->caller_owns_return_container = signal->result->shallow_transfer;
+ blob2->instance_transfer_ownership = signal->instance_transfer_full;
blob2->reserved = 0;
blob2->n_arguments = n;
@@ -1820,6 +1822,7 @@ _g_ir_node_build_typelib (GIrNode *node,
blob2->may_return_null = vfunc->result->nullable;
blob2->caller_owns_return_value = vfunc->result->transfer;
blob2->caller_owns_return_container = vfunc->result->shallow_transfer;
+ blob2->instance_transfer_ownership = vfunc->instance_transfer_full;
blob2->reserved = 0;
blob2->n_arguments = n;
diff --git a/girepository/girnode.h b/girepository/girnode.h
index 4beef7f..02196e7 100644
--- a/girepository/girnode.h
+++ b/girepository/girnode.h
@@ -100,6 +100,7 @@ struct _GIrNodeFunction
gboolean is_constructor;
gboolean wraps_vfunc;
gboolean throws;
+ gboolean instance_transfer_full;
gchar *symbol;
@@ -188,6 +189,7 @@ struct _GIrNodeSignal
gboolean detailed;
gboolean action;
gboolean no_hooks;
+ gboolean instance_transfer_full;
gboolean has_class_closure;
gboolean true_stops_emit;
@@ -208,6 +210,7 @@ struct _GIrNodeVFunc
gboolean must_not_be_implemented;
gboolean is_class_closure;
gboolean throws;
+ gboolean instance_transfer_full;
char *invoker;
diff --git a/girepository/girparser.c b/girepository/girparser.c
index 6c76866..f928c2e 100644
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -1047,6 +1047,71 @@ parse_param_transfer (GIrNodeParam *param, const gchar *transfer, const gchar *n
}
static gboolean
+start_instance_parameter (GMarkupParseContext *context,
+ const gchar *element_name,
+ const gchar **attribute_names,
+ const gchar **attribute_values,
+ ParseContext *ctx,
+ GError **error)
+{
+ const gchar *transfer;
+ gboolean transfer_full;
+
+ if (!(strcmp (element_name, "instance-parameter") == 0 &&
+ ctx->state == STATE_FUNCTION_PARAMETERS))
+ return FALSE;
+
+ transfer = find_attribute ("transfer-ownership", attribute_names, attribute_values);
+
+ state_switch (ctx, STATE_PASSTHROUGH);
+
+ if (strcmp (transfer, "full") == 0)
+ transfer_full = TRUE;
+ else if (strcmp (transfer, "none") == 0)
+ transfer_full = FALSE;
+ else
+ {
+ g_set_error (error, G_MARKUP_ERROR,
+ G_MARKUP_ERROR_INVALID_CONTENT,
+ "invalid value for 'transfer-ownership' for instance parameter: %s", transfer);
+ return FALSE;
+ }
+
+ switch (CURRENT_NODE (ctx)->type)
+ {
+ case G_IR_NODE_FUNCTION:
+ case G_IR_NODE_CALLBACK:
+ {
+ GIrNodeFunction *func;
+
+ func = (GIrNodeFunction *)CURRENT_NODE (ctx);
+ func->instance_transfer_full = transfer_full;
+ }
+ break;
+ case G_IR_NODE_SIGNAL:
+ {
+ GIrNodeSignal *signal;
+
+ signal = (GIrNodeSignal *)CURRENT_NODE (ctx);
+ signal->instance_transfer_full = transfer_full;
+ }
+ break;
+ case G_IR_NODE_VFUNC:
+ {
+ GIrNodeVFunc *vfunc;
+
+ vfunc = (GIrNodeVFunc *)CURRENT_NODE (ctx);
+ vfunc->instance_transfer_full = transfer_full;
+ }
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ return TRUE;
+}
+
+static gboolean
start_parameter (GMarkupParseContext *context,
const gchar *element_name,
const gchar **attribute_names,
@@ -2848,11 +2913,10 @@ start_element_handler (GMarkupParseContext *context,
attribute_names, attribute_values,
ctx, error))
goto out;
- else if (strcmp (element_name, "instance-parameter") == 0)
- {
- state_switch (ctx, STATE_PASSTHROUGH);
- goto out;
- }
+ else if (start_instance_parameter (context, element_name,
+ attribute_names, attribute_values,
+ ctx, error))
+ goto out;
else if (strcmp (element_name, "c:include") == 0)
{
state_switch (ctx, STATE_C_INCLUDE);
diff --git a/girepository/gitypelib-internal.h b/girepository/gitypelib-internal.h
index 93d621b..5ccb617 100644
--- a/girepository/gitypelib-internal.h
+++ b/girepository/gitypelib-internal.h
@@ -465,6 +465,8 @@ typedef struct {
* freeing the container, but not its contents.
* @skip_return: Indicates that the return value is only useful in C and should
* be skipped.
+ * @instance_transfer_ownership: When calling, the function assumes ownership of
+ * the instance parameter.
* @reserved: Reserved for future use.
* @n_arguments: The number of arguments that this function expects, also the
* length of the array of ArgBlobs.
@@ -479,7 +481,8 @@ typedef struct {
guint16 caller_owns_return_value : 1;
guint16 caller_owns_return_container : 1;
guint16 skip_return : 1;
- guint16 reserved :12;
+ guint16 instance_transfer_ownership : 1;
+ guint16 reserved :11;
guint16 n_arguments;
diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c
index 565c95c..7b9cb35 100644
--- a/tests/repository/gitypelibtest.c
+++ b/tests/repository/gitypelibtest.c
@@ -276,6 +276,34 @@ test_signal_array_len (GIRepository * repo)
g_base_info_unref (testobj_info);
}
+static void
+test_instance_transfer_ownership (GIRepository * repo)
+{
+ GIObjectInfo *testobj_info;
+ GIFunctionInfo *func_info;
+ GITransfer transfer;
+
+ g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
+ testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
+ g_assert (testobj_info != NULL);
+
+ func_info = g_object_info_find_method (testobj_info, "instance_method");
+ g_assert (func_info != NULL);
+ transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
+ g_assert_cmpint (GI_TRANSFER_NOTHING, ==, transfer);
+
+ g_base_info_unref (func_info);
+
+ func_info = g_object_info_find_method (testobj_info, "instance_method_full");
+ g_assert (func_info != NULL);
+ transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
+ g_assert_cmpint (GI_TRANSFER_EVERYTHING, ==, transfer);
+
+ g_base_info_unref (func_info);
+
+ g_base_info_unref (testobj_info);
+}
+
int
main (int argc, char **argv)
{
@@ -292,6 +320,7 @@ main (int argc, char **argv)
test_hash_with_cairo_typelib (repo);
test_char_types (repo);
test_signal_array_len (repo);
+ test_instance_transfer_ownership (repo);
exit (0);
}
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page
new file mode 100644
index 0000000..2222bec
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.instance_method_full"
+ type="topic"
+ style="method"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/1.0/ui/">
+ <info>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>regress_test_obj_instance_method_full</api:name>
+ <api:arg>
+ <api:type>RegressTestObj*</api:type>
+ <api:name>obj</api:name>
+ </api:arg>
+ </api:function>
+ </info>
+ <title>regress_test_obj_instance_method_full</title>
+ <synopsis><code mime="text/x-csrc">
+void regress_test_obj_instance_method_full (RegressTestObj* obj);
+ </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page
new file mode 100644
index 0000000..5b7e1c9
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.instance_method_full"
+ type="topic"
+ style="method"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/1.0/ui/">
+ <info>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
+ <api:function>
+ <api:returns>
+ <api:type>void</api:type>
+ </api:returns>
+ <api:name>regress_test_obj_instance_method_full</api:name>
+ </api:function>
+ </info>
+ <title>Regress.TestObj.prototype.instance_method_full</title>
+ <synopsis><code mime="text/x-gjs">
+function instance_method_full(): void {
+ // Gjs wrapper for regress_test_obj_instance_method_full()
+}
+ </code></synopsis>
+
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page
new file mode 100644
index 0000000..2b5c1dc
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.instance_method_full"
+ type="topic"
+ style="method"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:api="http://projectmallard.org/experimental/api/"
+ xmlns:ui="http://projectmallard.org/1.0/ui/">
+ <info>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
+ <api:function>
+ <api:returns>
+ <api:type>none</api:type>
+ </api:returns>
+ <api:name>regress_test_obj_instance_method_full</api:name>
+ <api:arg>
+ <api:type>Regress.TestObj</api:type>
+ <api:name>self</api:name>
+ </api:arg>
+ </api:function>
+ </info>
+ <title>Regress.TestObj.instance_method_full</title>
+ <synopsis><code mime="text/x-python">
+@accepts(Regress.TestObj)
+@returns(none)
+def instance_method_full(self):
+ # Python wrapper for regress_test_obj_instance_method_full()
+ </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index 1c9c300..89ecaa4 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -3057,6 +3057,17 @@ case.</doc>
</parameter>
</parameters>
</method>
+ <method name="instance_method_full"
+ c:identifier="regress_test_obj_instance_method_full">
+ <return-value transfer-ownership="none">
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <instance-parameter name="obj" transfer-ownership="full">
+ <type name="TestObj" c:type="RegressTestObj*"/>
+ </instance-parameter>
+ </parameters>
+ </method>
<method name="set_bare" c:identifier="regress_test_obj_set_bare">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
diff --git a/tests/scanner/Regress-1.0-sections-expected.txt b/tests/scanner/Regress-1.0-sections-expected.txt
index c9ff60a..187aa16 100644
--- a/tests/scanner/Regress-1.0-sections-expected.txt
+++ b/tests/scanner/Regress-1.0-sections-expected.txt
@@ -334,6 +334,7 @@ regress_test_obj_emit_sig_with_uint64
regress_forced_method
regress_test_obj_instance_method
regress_test_obj_instance_method_callback
+regress_test_obj_instance_method_full
regress_test_obj_set_bare
regress_test_obj_skip_inout_param
regress_test_obj_skip_out_param
diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
index 1bad36e..b42e0cd 100644
--- a/tests/scanner/regress.c
+++ b/tests/scanner/regress.c
@@ -2679,6 +2679,17 @@ regress_test_obj_instance_method (RegressTestObj *obj)
return -1;
}
+/**
+ * regress_test_obj_instance_method_full:
+ * @obj: (transfer full):
+ *
+ */
+void
+regress_test_obj_instance_method_full (RegressTestObj *obj)
+{
+ g_object_unref (obj);
+}
+
double
regress_test_obj_static_method (int x)
{
diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
index e2e645b..667f129 100644
--- a/tests/scanner/regress.h
+++ b/tests/scanner/regress.h
@@ -527,6 +527,7 @@ void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj *obj);
void regress_test_obj_emit_sig_with_int64 (RegressTestObj *obj);
void regress_test_obj_emit_sig_with_uint64 (RegressTestObj *obj);
int regress_test_obj_instance_method (RegressTestObj *obj);
+void regress_test_obj_instance_method_full (RegressTestObj *obj);
double regress_test_obj_static_method (int x);
void regress_forced_method (RegressTestObj *obj);
--
cgit v0.10.1

@ -7,7 +7,7 @@ GCONF_DEBUG="no"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml"
inherit eutils gnome2 python-single-r1 toolchain-funcs versionator
inherit gnome2 python-single-r1 toolchain-funcs versionator
DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
@ -19,7 +19,7 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
test? ( cairo )
"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# virtual/pkgconfig needed at runtime, bug #505408
# We force glib and goi to be in sync by this way as explained in bug #518424
@ -45,12 +45,6 @@ pkg_setup() {
python-single-r1_pkg_setup
}
src_prepare() {
# Prevent gjs crashes, bug #523608 (from 'master')
epatch "${FILESDIR}/${PN}-1.40.0-gjs-crash.patch"
gnome2_src_prepare
}
src_configure() {
if ! has_version "x11-libs/cairo[glib]"; then
# Bug #391213: enable cairo-gobject support even if it's not installed
@ -62,8 +56,8 @@ src_configure() {
# To prevent crosscompiling problems, bug #414105
gnome2_src_configure \
--disable-static \
CC=$(tc-getCC) \
YACC=$(type -p yacc) \
CC="$(tc-getCC)" \
YACC="$(type -p yacc)" \
$(use_with cairo) \
$(use_enable doctool)
}

@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
LICENSE="LGPL-2"
SLOT="0.6"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="

@ -1,3 +1,2 @@
DIST libgweather-3.14.3.tar.xz 3467744 SHA256 04dd25064cdc7715c1bf5fc476c8596d640cbcb3551217867195cef16bbbbf6b SHA512 f6e82c1a1b26ccaf0f6feb533147ac4108210096a7462ec394aa4174d772ad74c92ecae16450875a5c965ee17c0d041bee25de98a6ee8b842091adb426bd1d01 WHIRLPOOL bdf76e024bd0d7d71f60d162f7cee5e8b407bff318a71e28112c2ee5b68c66c726eb1b9484c3e033b7f3c7d1b515dad3b5c91c1de53d8d10e2cef26e1cd9f66d
DIST libgweather-3.14.4.tar.xz 3471124 SHA256 e65555079fce545082ba2231ae9fdeb8ff1716286f36d86806834ab8b1274b18 SHA512 d72d2c1b0abf3a2a12f54d7f8d62dc6e3eda3cdf03012afb22b28ac751fe7a64811656ed82197212e55366547702e0e3e8d3984037c68b7bce036bd1a75c3366 WHIRLPOOL 5d6e977d31e74caa83b9de1d2ebc966f2d89f957e0768aa38735bf3c8e83fe407524c161374a00eba5dd446c3514c6cb785ca209b1884c09283c5e329f7c8557
DIST libgweather-3.16.1.tar.xz 3478080 SHA256 db0955261427bb0f1a3f2747507863c591bf2f09dc477cfbf1cea0382cd34dfd SHA512 753f5428760b1a14bda18c4b2ae056d54433ef68745521f3ec3685b298b934667206af23d61604d13ddc8d36a2a659c02e2a2d498be288c16ea67d4c3eadf040 WHIRLPOOL ae2f2891afd3d8150377c4ae9076533892b49143f4871836415384a065f2f69d9768c1c07f9bc853919f1f5c41db2068e1fe480f64a8c098bed6a5ee3f0a1c33
DIST libgweather-3.18.1.tar.xz 3430524 SHA256 94b2292f8f7616e2aa81b1516befd7b27682b20acecbd5d656b6954990ca7ad0 SHA512 1fc6fda3610bcb4efd0eae57ce8706f126301f5d8399ff765d00c9cc8a513150d07cd098bc53e372b338b7801bd003d651cea0f5832edb990197d456bc89370f WHIRLPOOL 19a7ec0d72f3f4740e7c1acfa83eaf6136e6523a094c6b70e85b3bafaed553e4fa6746fea31a10db888c29dc2556559dca7600be2d78b8c98f0a6d32af88bacf

@ -1,56 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala
DESCRIPTION="Library to access weather information from online services"
HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
LICENSE="GPL-2+"
SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=x11-libs/gtk+-3.13.5:3[introspection?]
>=dev-libs/glib-2.35.1:2
>=net-libs/libsoup-2.34:2.4
>=dev-libs/libxml2-2.6.0
sci-geosciences/geocode-glib
>=sys-libs/timezone-data-2010k
glade? ( >=dev-util/glade-3.16:3.10 )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
"
RDEPEND="${COMMON_DEPEND}
!<gnome-base/gnome-applets-2.22.0
"
DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.11
>=dev-util/intltool-0.50
>=sys-devel/gettext-0.18
virtual/pkgconfig
vala? ( $(vala_depend) )
"
src_prepare() {
use vala && vala_src_prepare
gnome2_src_prepare
}
src_configure() {
DOCS="AUTHORS MAINTAINERS NEWS README"
gnome2_src_configure \
--disable-static \
$(use_enable glade glade-catalog) \
$(use_enable introspection) \
$(use_enable vala)
}

@ -4,7 +4,6 @@
EAPI="5"
GCONF_DEBUG="no"
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala
@ -17,7 +16,7 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=x11-libs/gtk+-3.13.5:3[introspection?]
@ -28,7 +27,7 @@ COMMON_DEPEND="
>=sys-libs/timezone-data-2010k
glade? ( >=dev-util/glade-3.16:3.10 )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
"
RDEPEND="${COMMON_DEPEND}
!<gnome-base/gnome-applets-2.22.0

@ -1,2 +1,2 @@
DIST libpeas-1.12.1.tar.xz 522616 SHA256 e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6 SHA512 3b3f973066d8237da666b60fd8b34c93159c98742b255dd0205d2cfeb474635e823b60412f833564ce6116101c2c2b263fed7a59f1fc624d0a727c9e2897b58c WHIRLPOOL adbaff8093c8d5b0f1c174be2d2011512aa98da471302910a7a52f5b70a39333f514e68b71803f5c74022146a0b6dfb657c9cc960fa755c98f453216e4ef2d25
DIST libpeas-1.14.0.tar.xz 546092 SHA256 5e4b3a8968b71497ab26a7a528c414c4c640c5724328fa3507854f04788e2d76 SHA512 64559d317833c53d8c64cb627ccc2efff8df1469192bf71504aee8558c76562e987d9c7618c192e621422710d524b91a6496a1255a441242067fc71c9283bddf WHIRLPOOL dd2072446fbf2b36443e60745b53aab8d4eac8cb6c624108b722faa27eea29422f99d0cb0253f626a051d0754778ee48d9596e539f2e97916ddfa75ed7435cc2
DIST libpeas-1.16.0.tar.xz 548972 SHA256 b093008ecd65f7d55c80517589509698ff15ad41f664b11a3eb88ff461b1454e SHA512 ae3024c8229222f8d683dd88d6f2aeb61e17b676e317e6d824b72e1fecce577f138625933afd7ad6627de961d2b95dcdd5a3593256f2acd05a15e0eede389c6e WHIRLPOOL 367f24916b3289e8e97c16e9367f94533a879945f72a1214d8a67fab070d30a33137768f0be173bd9151f6ea794297225231eade015c476da1ea88b09bc14d32

@ -1,74 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit gnome2 multilib python-r1 virtualx
DESCRIPTION="A GObject plugins library"
HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="+gtk glade +python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
RDEPEND="
>=dev-libs/glib-2.32:2
>=dev-libs/gobject-introspection-1.39
glade? ( >=dev-util/glade-3.9.1:3.10 )
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.11
>=dev-util/intltool-0.40
virtual/pkgconfig
"
src_configure() {
# --disable-seed because it's dead, bug #541890
local myconf=(
$(use_enable glade glade-catalog)
$(use_enable gtk)
--disable-deprecation
--disable-seed
--disable-static
# possibly overriden below
--disable-python{2,3}
)
# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
# What do we do about gdb, valgrind, gcov, etc?
python_configure() {
local v
python_is_python3 && v=3 || v=2
myconf+=(
"--enable-python${v}"
# it is just 'PYTHON' for py3 in the build system
"PYTHON${v#3}=${PYTHON}"
"PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
)
}
use python && python_foreach_impl python_configure
gnome2_src_configure "${myconf[@]}"
}
src_test() {
# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
# To reproduce:
# >>> from gi.repository import Gtk
# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
# This should return True, it returns False for Xvfb
Xemake check
}

@ -5,7 +5,7 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit autotools eutils gnome2 multilib python-r1 virtualx

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save