Clean up old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

4 files changed, 6 insertions, 139 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index c72e85e2f7c0..157999fa2528 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/shared-mime-info
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.224 2015/05/27 12:28:40 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.225 2015/05/27 13:16:28 tetromino Exp $
+
+  27 May 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -shared-mime-info-1.2-r1.ebuild, -shared-mime-info-1.3.ebuild,
+  -files/shared-mime-info-1.2-g_type_init.patch:
+  Clean up old.
 
   27 May 2015; Mikle Kolyada <zlogene@gentoo.org> shared-mime-info-1.4.ebuild:
   arm stable wrt bug #545866
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.2-g_type_init.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.2-g_type_init.patch
deleted file mode 100644
index 196925eb5e84..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-1.2-g_type_init.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2397314542265405498ea8c82121c174ed9011a5 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 09 Oct 2013 20:09:56 +0000
-Subject: test: Call g_type_init() with older glib
-
-Only call g_type_init() when compiling against an older glib.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=70255
----
-diff --git a/test-tree-magic.c b/test-tree-magic.c
-index 9b4dfaf..fd5cd7e 100644
---- a/test-tree-magic.c
-+++ b/test-tree-magic.c
-@@ -637,7 +637,10 @@ int main (int argc, char **argv)
- 	char *content, **lines;
- 	guint i;
- 
-+#if GLIB_CHECK_VERSION(2,36,0)
-+#else
- 	g_type_init ();
-+#endif
- 
- 	if (argc != 2) {
- 		g_print ("Usage: %s [file]\n", argv[0]);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild
deleted file mode 100644
index 5245a3a93729..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild,v 1.13 2014/01/18 20:02:35 ago Exp $
-
-EAPI=5
-inherit eutils fdo-mime
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
-SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-g_type_init.patch
-}
-
-src_configure() {
-	export ac_cv_func_fdatasync=no #487504
-
-	econf \
-		$(use_enable test default-make-check) \
-		--disable-update-mimedb
-}
-
-src_compile() {
-	# FIXME: 0.91 fails with -j9 every second time like:
-	# update_mime_database-update-mime-database.o: file not recognized: File truncated
-	# collect2: ld returned 1 exit status
-	emake -j1
-}
-
-src_install() {
-	default
-
-	# in prefix, install an env.d entry such that prefix patch is used/added
-	if use prefix; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
-		doenvd "${T}"/50mimeinfo
-	fi
-}
-
-pkg_postinst() {
-	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.3.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.3.ebuild
deleted file mode 100644
index 7d13ca43bf2f..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-1.3.ebuild,v 1.1 2014/05/30 14:08:01 ssuominen Exp $
-
-EAPI=5
-inherit eutils fdo-mime
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
-SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog HACKING NEWS README )
-
-src_configure() {
-	export ac_cv_func_fdatasync=no #487504
-
-	econf \
-		$(use_enable test default-make-check) \
-		--disable-update-mimedb
-}
-
-src_compile() {
-	# FIXME: 0.91 fails with -j9 every second time like:
-	# update_mime_database-update-mime-database.o: file not recognized: File truncated
-	# collect2: ld returned 1 exit status
-	emake -j1
-}
-
-src_install() {
-	default
-
-	# in prefix, install an env.d entry such that prefix patch is used/added
-	if use prefix; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
-		doenvd "${T}"/50mimeinfo
-	fi
-}
-
-pkg_postinst() {
-	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	fdo-mime_mime_database_update
-}