summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-02-03 14:41:50 +0000
committerPacho Ramos <pacho@gentoo.org>2015-02-03 14:41:50 +0000
commitbd8dbad1235dca7caf027f18d9adec2ae362c475 (patch)
tree918463ac1f22eca94596bb7f638e0494b0bfbf6b /app-text
parentRemove masked for removal package (diff)
downloadhistorical-bd8dbad1235dca7caf027f18d9adec2ae362c475.tar.gz
historical-bd8dbad1235dca7caf027f18d9adec2ae362c475.tar.bz2
historical-bd8dbad1235dca7caf027f18d9adec2ae362c475.zip
Remove masked for removal package
Diffstat (limited to 'app-text')
-rw-r--r--app-text/mate-doc-utils/ChangeLog26
-rw-r--r--app-text/mate-doc-utils/Manifest24
-rw-r--r--app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild78
-rw-r--r--app-text/mate-doc-utils/metadata.xml8
-rw-r--r--app-text/mate-document-viewer/ChangeLog27
-rw-r--r--app-text/mate-document-viewer/Manifest19
-rw-r--r--app-text/mate-document-viewer/files/mate-document-viewer-1.6-libsecret.patch168
-rw-r--r--app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild94
-rw-r--r--app-text/mate-document-viewer/metadata.xml18
9 files changed, 0 insertions, 462 deletions
diff --git a/app-text/mate-doc-utils/ChangeLog b/app-text/mate-doc-utils/ChangeLog
deleted file mode 100644
index 85917b709d24..000000000000
--- a/app-text/mate-doc-utils/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-# ChangeLog for app-text/mate-doc-utils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mate-doc-utils/ChangeLog,v 1.6 2014/05/04 14:53:07 ago Exp $
-
- 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-doc-utils-1.6.2.ebuild:
- Stable for amd64, wrt bug #509268
-
- 02 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-doc-utils-1.6.2.ebuild:
- Parallel build fails on some systems, s/gnome2_src_compile/emake -j1/
-
- 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-doc-utils-1.6.2.ebuild:
- Update dependencies per the consensus formed with ssuominen.
-
- 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
- mate-doc-utils-1.6.2.ebuild:
- Remove bogus SLOT dependencies from pkg-config, gettext, intltool and gawk.
-
- 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-doc-utils-1.6.2.ebuild:
- Further review of dependencies.
-
-*mate-doc-utils-1.6.2 (28 Feb 2014)
-
- 28 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +mate-doc-utils-1.6.2.ebuild,
- +metadata.xml:
- New ebuild for app-text/mate-doc-utils, Documentation utilities for MATE;
- imported from the mate-overlay, reviewed and adjusted.
diff --git a/app-text/mate-doc-utils/Manifest b/app-text/mate-doc-utils/Manifest
deleted file mode 100644
index def91e2e08b7..000000000000
--- a/app-text/mate-doc-utils/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mate-doc-utils-1.6.2.tar.xz 472156 SHA256 dce8ccf5790ec3564424eae73bd5131b5190abb3f915fe1a876d1e9d2156090e SHA512 a3609b9a1670eaf62a0b37f218feba3a9b57de65d2145bc2c95dcb49232c49bc0c73aa98c68ec8574c7693e774a4a4121f18b1767c877585d42726d1730a4f50 WHIRLPOOL a7a52cfd2d22854b1fa301d3e9e8f6ca9eb71bcd61ce6491f519e924334d2d013057f148ec8eb1e15dbd6f62b43b2113871db027eedbbc40aafbb80cdd5cc5e1
-EBUILD mate-doc-utils-1.6.2.ebuild 2018 SHA256 bff3a7d2d965f8c32e6db4475a3b07fe0783c3156428d529a8e6851a8572a9c2 SHA512 925d8932547a897a67dc1307811cb611d45758428871427c3bf3c9cb56de30dad0206c6a14a573b204fd444a552e5e427511cf01fccaf0d88f61f42af54db703 WHIRLPOOL 2411ef6eb1af68225e8b0b91c3099d43325a04b84955f0d537360171a289e4dd57054a09779f6e212bfb5571353c2599312ec870a0dd8c7a9a71b616a4e4ddf1
-MISC ChangeLog 1159 SHA256 e4959626c70244ca511fa262e8f5c5b0de52adce23bd7cb0a35fcc74769f362d SHA512 268e4b28eb3d2b66ec9bdfe2a96050d6fdcac0bce00f6e7beea38238499b188b1b340ef5e339d21dd05a6c5dce87908f41084a9c5435952f0bffb291ee19fd31 WHIRLPOOL 01b0903e9f813c6b9b3806cb2514799c3c5a94526b0a3462eb3fda8d43502428b64e74b9b43249c2e37ce2fd3f68e80e6295f8883232a6912a2c02f833b3d768
-MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTZlRUAAoJELp701BxlEWfzPgP/Al30yB4cMLB3JYJ/koeZ7px
-1VLLN0RizxbddG6RcsMdBV3Buy7ZYvuF5QRKrB9SYsPu2Ppy/naMxg1plg3iVpcr
-XqPoXOu+p0fOg/PCZbEU+XkFvF5O6vRJCAeaqPbO+LPno642+IIPhSYIw0/dBZQ1
-cBx5+/uiCxKdrJugfmEGSNoim1pKhFvIpA+TyapWOsoezM0/o/PHNGLvDCwAdMzl
-21fETs+wLknJLVZL0AQj3r55DKfDbSixKe+unUPZj8+KmqX33ePW/35TtxvSZO+a
-HyADE4liA5lnmAL6ABIertrmE6oreRpnpZKNZdxY76SH5zkntFyFEGa25nYa35i3
-+fbgCb4KtbEWnfmbDWcR9EzPJ5wpix/Pc7oeJPj63K0fVDdCShIqBEYi/QU0jlYe
-r7/WiONB5o50wbR9+WyeuMx52mVC2aPYv8Wg2ProjJyoYnC5QdjZ1au0w9CtSsxW
-Vn14Ujfma7ldr/71KhEBlX8Nh1m7m+w+PI5qJU1L9W52gIBIG1U8GHGaAVz8CPAY
-dQ0NVn7gsq4eRgXYqJOXApnJclv+0VsQ7az1Pv8DG84fIXpyorUNy18QxkCtNpvZ
-eC6jCsr+q3OxqhLkYtI7+2ffX0BF3+Enu9SwdKV9vOoaEpE6YmQUVjM9QpplwU2b
-sPSpLBB71tM84C0URatl
-=Ossh
------END PGP SIGNATURE-----
diff --git a/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild b/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild
deleted file mode 100644
index c3f458d4d3cf..000000000000
--- a/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mate-doc-utils/mate-doc-utils-1.6.2.ebuild,v 1.6 2014/05/04 14:53:07 ago Exp $
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit gnome2 multilib python-r1 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Documentation utilities for MATE"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/rarian:0
- >=dev-libs/libxml2-2.6.12:2[python,${PYTHON_USEDEP}]
- >=dev-libs/libxslt-1.1.8:0
- virtual/libintl:0"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- >=app-text/gnome-doc-utils-0.20.10:0[${PYTHON_USEDEP}]
- app-text/scrollkeeper-dtd:1.0
- >=dev-util/intltool-0.35:*
- >=mate-base/mate-common-1.6:0
- >=sys-apps/gawk-3:0
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_prepare() {
- gnome2_src_prepare
-
- # Leave shebang alone.
- sed -e '/s+^#!.*python.*+#/d' \
- -i xml2po/xml2po/Makefile.{am,in} || die
-
- python_prepare() {
- mkdir -p "${BUILD_DIR}"
- }
-
- python_foreach_impl python_prepare
-}
-
-src_configure() {
- ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir emake -j1
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README
-
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- # Uncomment the below line when we stop relying on gnome-doc-utils.
- #python_replicate_script "${ED}"/usr/bin/xml2po
-
- # Remove xml2po, already provided by gnome-doc-utils.
- rm -rf "${ED}"usr/$(get_libdir)/python*/site-packages/xml2po || die
- rm -rf "${ED}"usr/bin/xml2po || die
- rm -rf "${ED}"usr/share/man/man*/xml2po* || die
- rm -rf "${ED}"usr/share/pkgconfig/xml2po* || die
- rm -rf "${ED}"usr/share/xml/mallard/*/mallard.{rnc,rng} || die
-}
diff --git a/app-text/mate-doc-utils/metadata.xml b/app-text/mate-doc-utils/metadata.xml
deleted file mode 100644
index dca1781cb290..000000000000
--- a/app-text/mate-doc-utils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>TomWij@gentoo.org</email>
- <name>Tom Wijsman</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-text/mate-document-viewer/ChangeLog b/app-text/mate-document-viewer/ChangeLog
deleted file mode 100644
index 9c8608e67038..000000000000
--- a/app-text/mate-document-viewer/ChangeLog
+++ /dev/null
@@ -1,27 +0,0 @@
-# ChangeLog for app-text/mate-document-viewer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mate-document-viewer/ChangeLog,v 1.4 2014/07/07 23:22:56 tomwij Exp $
-
- 07 Jul 2014; Tom Wijsman <TomWij@gentoo.org>
- mate-document-viewer-1.6.2-r1.ebuild:
- Add missing gnome-doc-utils dependency for xml2po; fixes bug #515782, reported
- by Patrick Lauer.
-
- 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
- mate-document-viewer-1.6.2-r1.ebuild:
- Stable for amd64, wrt bug #509268
-
-*mate-document-viewer-1.6.2-r1 (31 Mar 2014)
-
- 31 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
- +mate-document-viewer-1.6.2-r1.ebuild, -mate-document-viewer-1.6.2.ebuild:
- Revision bump, RDEPEND on mate-base/mate-desktop added as it installs a
- necessary scheme; fixes bug #505882, reported by Wicher Minnaard.
-
-*mate-document-viewer-1.6.2 (12 Mar 2014)
-
- 12 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
- +files/mate-document-viewer-1.6-libsecret.patch,
- +mate-document-viewer-1.6.2.ebuild, +metadata.xml:
- New ebuild for app-text/mate-document-viewer, Atril document viewer for MATE;
- imported from the mate-overlay, reviewed and adjusted.
diff --git a/app-text/mate-document-viewer/Manifest b/app-text/mate-document-viewer/Manifest
deleted file mode 100644
index e1ac43679045..000000000000
--- a/app-text/mate-document-viewer/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX mate-document-viewer-1.6-libsecret.patch 4895 SHA256 ad24653547a708b24b71fc02ff5b74d49af747f5066001642ac79ca8422ca6a9 SHA512 bd7334fb40ca9d4f96b7463dbaa6df5ede3e4d230016c6fff60c70f900c7036e6f7d4937c9427af971bd5b2509232cb68edd43165ed517385982ed675f7fab17 WHIRLPOOL fa0e8a177f14c841abc6da6ca6ed2df4d9bbe94b94eea32fb59a29d6acd49f7a592cb709c915416585fc85fd2978d67fa78b1c62ebab391552d43aeb8f73325a
-DIST mate-document-viewer-1.6.2.tar.xz 1695296 SHA256 8ef1933c7a0f91dfa7115d94fe3cacd9c30feb6fc7046e7ec3dfdff29247e943 SHA512 6a78ca116047f01ed34145ed177b3c967d3d781d85569445cd139871827bf203778f54e581aaef0a298f88a1d959ccb4e6aaf9c4c606c304864054f9547591a0 WHIRLPOOL 807b691cb5fef94d072fa9d2d012e83cdc475369d0577942382ff4fa48a277d99dcd8f785914f17aefd08a4656b8f884e6a76ccfbea031b89198e597d21b6f52
-EBUILD mate-document-viewer-1.6.2-r1.ebuild 2596 SHA256 b0294b7f62a8c90b8e984ab85681f8a3efe6f3e4d20bc99d1a3e77229a6adf82 SHA512 dc6b192e8094d72beecc8543c5d392f41414335878bca7c9de10a1b793903538cfac6ece82637556534a98b56b82975f1c308d3ece079c862e75622e68a65c71 WHIRLPOOL ac93850e7b336e8700a975e3ea14040693bff633729807d720f43e174b9156582d0a6b6b9b2eeaed0de813736f32866bcecec14cd1ee6f555e4f11c59c96d82a
-MISC ChangeLog 1190 SHA256 960b5e420ac07bb629a264ea78999c7f8bbcb7dc70cb838df6f8b8071687a1ec SHA512 8d17db66c872e0e5f39a9aa54502f82cdac4089c4f77cca13f040f5434348b2cdc7519991180306570326555a9c509e84fa3e3f0c78d3871da31230329274b4a WHIRLPOOL 611b65d1425fa4fc3432a6aa18e64b1069973d885f47e5ca81a07a35fda99ff52dfd8588ba7308d6c9cd3931d9311bb78e8b99c13162325a417df876d299a652
-MISC metadata.xml 655 SHA256 723d07f1c8ed8a4cf992de8118a2969d6f12474f73ae24df18b4c64321cadc9a SHA512 15e70c3ed3fcc05edc2e21876f2b5acbfd98344abae4477d0d5c2c7b19502e9979126263fe26cecf323c8a28c7f7df415dd53c08637cede9d5306947bdfda0ed WHIRLPOOL 1bfd20bd207e7bf0e8b58ff0c1310fda4deaa176dffeccd28563755b2162f560590059364e1fe4b6b510496c7f2eb4d39b86d3ae9094c2e1bab6321846188b30
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJTuyvUAAoJEJWyH81tNOV9tHgH/2Rrup9LGaOfUgpyvRnuimmz
-4aXhcQAyEu6sO0WkhqxLyGvIEl+SAtoatyQehuY76Ci5AZncueeY3j3HVinUrbXC
-rUg9M68d+cXACGxCuePx31Zj1xK2RQv55x0zQ+yIarMp1I4jeDB3hNleYdAZ4xS/
-xVyLT5gbMMoQIJcVc/LJ1hQ1msQtpswd1Y9meGpBBr3zg+Bk1cwwMej7F260TNLH
-8HhL4cYhrNtixw6Z43xbYzNcKddEn2ExIayqtZdDgtmbuPDq/Z31Uhi182KBZle8
-pHMbRhJYwdk/2xgj8Meab3Q+t2ir7MLcuxC5Wb7BAmtK6f0mrP7EJTSKMfnz0RE=
-=zVSA
------END PGP SIGNATURE-----
diff --git a/app-text/mate-document-viewer/files/mate-document-viewer-1.6-libsecret.patch b/app-text/mate-document-viewer/files/mate-document-viewer-1.6-libsecret.patch
deleted file mode 100644
index 7c5ab06f0ba9..000000000000
--- a/app-text/mate-document-viewer/files/mate-document-viewer-1.6-libsecret.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d2a4b87..fd2ec89 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,7 +133,7 @@ AC_MSG_RESULT([$with_gtk])
- dnl Specify required versions of dependencies
- CAIRO_REQUIRED=1.9.10
- GLIB_REQUIRED=2.25.11
--KEYRING_REQUIRED=1.1.0
-+LIBSECRET_REQUIRED=0.5
-
- case "$with_gtk" in
- 2.0) GTK_API_VERSION=2.0
-@@ -268,12 +268,12 @@ if test "$with_gtk_unix_print" = "yes"; then
- fi
-
- # *********************
--# MATE Keyring support
-+# Keyring support
- # *********************
-
- AC_ARG_WITH(keyring,
- [AS_HELP_STRING([--without-keyring],
-- [Disable the use of mate-keyring])],
-+ [Disable the use of libsecret and keyring])],
- [],
- [case "$with_platform" in
- mate) with_keyring=yes ;;
-@@ -283,7 +283,7 @@ AC_ARG_WITH(keyring,
- AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
-
- if test "$with_keyring" = "yes"; then
-- PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $KEYRING_REQUIRED)
-+ PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= $LIBSECRET_REQUIRED)
- AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
- fi
-
-@@ -341,8 +341,8 @@ BACKEND_LIBS="$BACKEND_LIBS -lm"
- AC_SUBST(BACKEND_CFLAGS)
- AC_SUBST(BACKEND_LIBS)
-
--SHELL_CFLAGS="$SHELL_CORE_CFLAGS $KEYRING_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
--SHELL_LIBS="$SHELL_CORE_LIBS $KEYRING_LIBS -lz -lm"
-+SHELL_CFLAGS="$SHELL_CORE_CFLAGS $LIBSECRET_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
-+SHELL_LIBS="$SHELL_CORE_LIBS $LIBSECRET_LIBS -lz -lm"
- AC_SUBST(SHELL_CFLAGS)
- AC_SUBST(SHELL_LIBS)
-
-diff --git a/shell/ev-keyring.c b/shell/ev-keyring.c
-index ac1d33a..3a9cd4c 100644
---- a/shell/ev-keyring.c
-+++ b/shell/ev-keyring.c
-@@ -25,24 +25,25 @@
- #include "ev-keyring.h"
-
- #ifdef WITH_KEYRING
--#include <mate-keyring.h>
-+#include <libsecret/secret.h>
-
--static const MateKeyringPasswordSchema doc_password_schema = {
-- MATE_KEYRING_ITEM_GENERIC_SECRET,
-+static const SecretSchema doc_password_schema = {
-+ "org.mate.Atril.Document",
-+ SECRET_SCHEMA_DONT_MATCH_NAME,
- {
-- { "type", MATE_KEYRING_ATTRIBUTE_TYPE_STRING },
-- { "uri", MATE_KEYRING_ATTRIBUTE_TYPE_STRING },
-+ { "type", SECRET_SCHEMA_ATTRIBUTE_STRING },
-+ { "uri", SECRET_SCHEMA_ATTRIBUTE_STRING },
- { NULL, 0 }
- }
- };
--const MateKeyringPasswordSchema *EV_DOCUMENT_PASSWORD_SCHEMA = &doc_password_schema;
-+const SecretSchema *EV_DOCUMENT_PASSWORD_SCHEMA = &doc_password_schema;
- #endif /* WITH_KEYRING */
-
- gboolean
- ev_keyring_is_available (void)
- {
- #ifdef WITH_KEYRING
-- return mate_keyring_is_available ();
-+ return TRUE;
- #else
- return FALSE;
- #endif
-@@ -51,31 +52,17 @@
- gchar *
- ev_keyring_lookup_password (const gchar *uri)
- {
-- gchar *retval = NULL;
- #ifdef WITH_KEYRING
-- MateKeyringResult result;
-- gchar *password = NULL;
--
- g_return_val_if_fail (uri != NULL, NULL);
-
-- if (!mate_keyring_is_available ())
-- return NULL;
--
-- result = mate_keyring_find_password_sync (EV_DOCUMENT_PASSWORD_SCHEMA,
-- &password,
-- "type", "document_password",
-- "uri", uri,
-- NULL);
-- if (result != MATE_KEYRING_RESULT_OK || !password) {
-- if (password)
-- mate_keyring_free_password (password);
-- return NULL;
-- }
--
-- retval = g_strdup (password);
-- mate_keyring_free_password (password);
-+ return secret_password_lookup_sync (EV_DOCUMENT_PASSWORD_SCHEMA,
-+ NULL, NULL,
-+ "type", "document_password",
-+ "uri", uri,
-+ NULL);
-+#else
-+ return NULL;
- #endif /* WITH_KEYRING */
-- return retval;
- }
-
- gboolean
-@@ -84,32 +71,29 @@
- GPasswordSave flags)
- {
- #ifdef WITH_KEYRING
-- MateKeyringResult result;
-- const gchar *keyring;
-- gchar *name;
-- gchar *unescaped_uri;
-+ const gchar *keyring;
-+ gchar *name;
-+ gchar *unescaped_uri;
-+ gboolean retval;
-
- g_return_val_if_fail (uri != NULL, FALSE);
-
-- if (!mate_keyring_is_available ())
-- return FALSE;
--
- if (flags == G_PASSWORD_SAVE_NEVER)
- return FALSE;
-
-- keyring = (flags == G_PASSWORD_SAVE_FOR_SESSION) ? "session" : NULL;
-+ keyring = (flags == G_PASSWORD_SAVE_FOR_SESSION) ? SECRET_COLLECTION_SESSION : NULL;
- unescaped_uri = g_uri_unescape_string (uri, NULL);
- name = g_strdup_printf (_("Password for document %s"), unescaped_uri);
- g_free (unescaped_uri);
-
-- result = mate_keyring_store_password_sync (EV_DOCUMENT_PASSWORD_SCHEMA,
-- keyring, name, password,
-- "type", "document_password",
-- "uri", uri,
-- NULL);
-+ retval = secret_password_store_sync (EV_DOCUMENT_PASSWORD_SCHEMA, keyring,
-+ name, password, NULL, NULL,
-+ "type", "document_password",
-+ "uri", uri,
-+ NULL);
- g_free (name);
-
-- return (result == MATE_KEYRING_RESULT_OK);
-+ return retval;
- #else
- return FALSE;
- #endif /* WITH_KEYRING */
diff --git a/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild b/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild
deleted file mode 100644
index 6b5dbb9719f7..000000000000
--- a/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mate-document-viewer/mate-document-viewer-1.6.2-r1.ebuild,v 1.3 2014/07/07 23:22:56 tomwij Exp $
-
-EAPI="5"
-
-ELTCONF="--portage"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Atril document viewer for MATE"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="caja dbus debug djvu dvi +introspection gnome-keyring +ps t1lib tiff xps"
-
-RDEPEND="app-text/gnome-doc-utils:0
- >=app-text/poppler-0.14:0=[cairo]
- app-text/rarian:0
- >=dev-libs/glib-2.25.11:2
- >=dev-libs/libxml2-2.5:2
- >=mate-base/mate-desktop-1.6:0
- >=x11-libs/gtk+-2.21.5:2[introspection?]
- >=x11-libs/libSM-1:0
- >=x11-libs/cairo-1.9.10:0
- >=x11-themes/mate-icon-theme-1.6:0
- caja? ( >=mate-base/mate-file-manager-1.6:0[introspection?] )
- djvu? ( >=app-text/djvu-3.5.17:0 )
- dvi? (
- virtual/tex-base:0
- t1lib? ( >=media-libs/t1lib-5:5 )
- )
- gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
- introspection? ( >=dev-libs/gobject-introspection-0.6:0 )
- ps? ( >=app-text/libspectre-0.2:0 )
- tiff? ( >=media-libs/tiff-3.6:0 )
- xps? ( >=app-text/libgxps-0.0.1:0 )"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=app-text/mate-doc-utils-1.6:0
- >=app-text/scrollkeeper-dtd-1:1.0
- >=dev-util/intltool-0.35:*
- virtual/pkgconfig:*
- sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-src_prepare() {
- # Fix .desktop categories, upstream bug #666346.
- sed -e "s:GTK\;Graphics\;VectorGraphics\;Viewer\;:GTK\;Office\;Viewer\;Graphics\;VectorGraphics;:g" -i data/atril.desktop.in.in || die
-
- epatch "${FILESDIR}"/${PN}-1.6-libsecret.patch
-
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # Passing --disable-help would drop offline help, that would be inconsistent
- # with helps of the most of GNOME apps that doesn't require network for that.
- gnome2_src_configure \
- --disable-tests \
- --enable-comics \
- --enable-help \
- --enable-pdf \
- --enable-pixbuf \
- --enable-thumbnailer \
- --with-smclient=xsmp \
- --with-platform=mate \
- --with-gtk=2.0 \
- $(use_enable dbus) \
- $(use_enable djvu) \
- $(use_enable dvi) \
- $(use_with gnome-keyring keyring) \
- $(use_enable introspection) \
- $(use_enable caja) \
- $(use_enable ps) \
- $(use_enable t1lib) \
- $(use_enable tiff) \
- $(use_enable xps)
-}
-
-DOCS="AUTHORS NEWS README TODO"
diff --git a/app-text/mate-document-viewer/metadata.xml b/app-text/mate-document-viewer/metadata.xml
deleted file mode 100644
index 12b09285ce38..000000000000
--- a/app-text/mate-document-viewer/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>TomWij@gentoo.org</email>
- <name>Tom Wijsman</name>
- </maintainer>
- <use>
- <flag name="caja">Enable property page extension in
- <pkg>mate-base/mate-file-manager</pkg></flag>
- <flag name="dvi">Enable build-in DVI viewer</flag>
- <flag name="ps">Enable build-in postscript viewer</flag>
- <flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
- (<pkg>media-libs/t1lib</pkg>)</flag>
- <flag name="xps">Enable XPS viewer using
- <pkg>app-text/libxps</pkg></flag>
- </use>
-</pkgmetadata>