Clean up old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

5 files changed, 23 insertions, 151 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/Manifest b/x11-misc/shared-mime-info/Manifest
index e2a291a49c48..5333cfdbb99d 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,24 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX shared-mime-info-1.2-g_type_init.patch 696 SHA256 5a0add1740c052a8ed0e3b069eaf717468fc27c48f7134a143899cbb568729ab SHA512 b3b7b2539d4d6faf555b34ec490d51d6c5de4582ac7a2b891ce26a3315d33437377566434bf26ff094aca9a0b12b1383c0b94af737fc0a2e11c0c6c6f9e8d4d3 WHIRLPOOL 6e38b3fb21cd4f7f7cf61e753a4fff07a431be281102cf82d5b2ca2f835fc850529f036ad90107a5fac7e4c87c1e5a27904d473140e3782bd329f8529e5684eb
 AUX shared-mime-info-1.4-iso-1.patch 1589 SHA256 cb42b4d522810dff58ae31c0cdaef847292a783df681147e1d3c5726ed7b3a1c SHA512 89be5ccdf28137a57ae50e433fde319babf7b4dc8c2c971344943b8172c0e1ce4c775a5289301243199b7991e79911569d09a9765d94e74d94517f6b7b9066f5 WHIRLPOOL ec4c0011d6336321c267e3fd0b8171127ec97ec0abae029b7d72080e93c758b7b39b2311ef54004813609697e335ac5ed112ec3213c9b0c39749002e06682ed0
 AUX shared-mime-info-1.4-iso-2.patch 997 SHA256 3149a6189679293b0a06b68f027736d28b08174272708397da66d9a816944676 SHA512 406e404fee8d0a221ef756e702e879c79a274662ad3299e71e4d2cee3440ba4cd040ebc5e829beb56806a70e93da3aa1351752022f8dacd5555dae04cba628c4 WHIRLPOOL 8b73eae2ddfa7977e3e9f2f730ae00593464bc8be30ad797903d4dbd632303c67219cc603b3732f2f88bcddcdd81c31bb5fcea8af1577146f08b75b96eefc151
-DIST shared-mime-info-1.2.tar.xz 514612 SHA256 a5516ae241b95a948a6749b1cbf65dc20c3bb563a73cc7bedb7065933788bb78 SHA512 25888c2500e21a9dfdb189e7f48edf409523e0c1566d1f5b0d61eaf4faa4bcb83eca5f56d6d2ab03e44d5d4a0cc4504a566b9c773c8a634c0798f7560fe83d4c WHIRLPOOL 40a6cbf9dbba7fd037d01a34a711f3f484e3be5c240232f6925d31ffb5eda129f1f6f29edb4cff168938161f68558577099d6e9750e5e2a0659df5982c2df6aa
-DIST shared-mime-info-1.3.tar.xz 517420 SHA256 4fd49c8c7ca9ecb10c59845094a18dbb73b69c72b4bad3db5e864f2111cb323a SHA512 ef74f71e877a9117ca796e0425ffdc0a47200b543c9989c9952d59d5a4c8ed9d086c1f5b73af343b7e59d8080d1813b5c2fe2896fe619f753af315460136fb5d WHIRLPOOL 0eb482d7aaa6ea89f7fa72bb463f1ba38435ef20b2d086b0011e5f4a88fe329581d740a13126b0fa58df7bece2018930be39e66bbd7bbdfe97218497e1e234be
 DIST shared-mime-info-1.4.tar.xz 537916 SHA256 bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582 WHIRLPOOL 32cb301cd54140b83af8c321b7ebc571b87b07ca86bfc68e6760e4dd3551188a092a96087042b13f1278c11cd88c261879fc816d0c2efcbee473211d929194bf
-EBUILD shared-mime-info-1.2-r1.ebuild 1686 SHA256 7e8f378b92f968a883e3e70b71cfec5517ecfdcc694d5ff8e0b12ef6355c8d65 SHA512 bc5fc241a6415b88834e320c1ab623046e2c97dbce2174618884d5d8dc44ca6bc33daec45809824efcbd005c52e614aa219bd4b0770c2cdb31366dfea7cfb238 WHIRLPOOL 68ea9d563935d94fd6e80bc9902ada8f7f318228933643e20e70061976d60d449e03aa18bea6494c5e710be25d51ff47ade8e66b9ca48b5956c81791d4114ccb
-EBUILD shared-mime-info-1.3.ebuild 1637 SHA256 425f0c1bd92a78766f156f09e033e779810061a56d1d3bd4159dc1dae727fa08 SHA512 a60f648a98b6a6a3c44828bc2ff2cb737212a5551e9822ae62d46bc4278502ddc2c4b3fb01390a5770ab5f13e5cb0081f2b60562ec591afba0f163b858d6ec87 WHIRLPOOL cb8435b922a2e4a26e450e10e95a396c0f99fe58bc692997fdf61a7f837db22c5a81b0c0eafeba907eb3850e1022c37acb1f1767321637192846a16c68c7b5a0
 EBUILD shared-mime-info-1.4-r1.ebuild 1812 SHA256 03833ac2716b29237fcb94702227c484596a5906d86ce4d65694a5658b9b86eb SHA512 868fdd8850f136067840cc05d47d341cbdd4287b923ccc4d78f8464460e13b4ba48abadea0b05c79c9fab34cd10c94d2641b5e508ee6b7720b03936a275ba8c3 WHIRLPOOL 55383ee7ee6efe6d2e698f66e3392f1600043842bebf62f82fd94acedf7e334f76030c73f9965e37fcc1e9586310819f42d4d0b6de5797a181ce5e1827145f64
 EBUILD shared-mime-info-1.4.ebuild 1627 SHA256 ddf1a8e79eb7bdedc90e958d207c40f7812303ac63b7c90809c2f0684323e21f SHA512 e3bb6335141c769f2767d0d2eab158888dacf422d843434015f42326215150f93f23c3a27ef51dbc8a76b7e0ab2cf2e47570bca53a8631082a8152eb6b8fb137 WHIRLPOOL ced349c5724339a0d2f1bcf402c391853576cf4fe6f9ce3e980fbd2c9997b291f070691aa82ce02bb7258618c62ebf662fe58abc38c22645ce0da8fbfe4a6192
-MISC ChangeLog 28315 SHA256 34d529ce0e2cef0686ee7543a72a72fa47a4663becdb8e8f8829fa5fc3ccbaec SHA512 6022b87caa4c62415f3263c79ded13a61a0fb544f29b9673a573a1c6f525572d1072027a1591ac99f6fca62b853fdffc2cb61cb97eec6b45a5e93a49ed4832b2 WHIRLPOOL 90a7f2c65fc3a4c41bef6634817fe38cb733ce61d1c24227247c804b6c8a5cdaa190bf2d9ec9b20a974de9225e410fe252165ab2fd40f565a27f632a3b9665fa
+MISC ChangeLog 28507 SHA256 44e69a7e522789b7cbfdc5451d44d92e7b4a2ca7b9c2510089811048acb87c92 SHA512 3646fa4e5a71fc14a7cd5c489f54212ace7d351286377cb3b27bf7f100286ac00e4545b9c8c44ebd599dcb71bdd3df950772f510aba6902a403a30d10506762e WHIRLPOOL d0e3f8c94374de547e25f4bdf6f78cf18111d40716a1a633d28588db97b0d5b8bad58d802ae66193b55f8ce2c3b79321d10e76b2393a5bba8a19e46b9aafe9b4
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlVlt/8ACgkQG9wOWsQutdZiNQQAzzSsleZyqH8F4pM+t2kDD0TC
-u5QLiGBPH6k+MxOZAg63FKfxr2tEfq15UaeERaI19JrSLBBHjRhxoLHQT7UBzudA
-ElhMAv3mWZPxIrRUcHZbxan6bBGyJAANjNIpgWMSygTBr/JsStLK8mNuOGCPVY2y
-ThYteXKTJ4TTU79nohs=
-=aMgb
+iQJ8BAEBCABmBQJVZcOtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNXwEP/0E2pX4gbZ892pWeBXioCFzA
+z/2YMQv88mZ0oD96BfHIOO7WNnHcejmwn4Gm3S0Nq2HpY5jK2MRjMiw5cV519uZt
+MnFHHxCOqYgEIAKKFfjKVw5np3gXT6PuyWzKPJ4GVoolICcBbZOa8gRsP9i4uLTr
+j7W5CVaJ8pU+Sn8ATUUivtSFAQfGQevogVU1lyXo55621byuuBlW2vf0quYXMMhS
+dX/xWedhCCje5+IEXdDOeeXTIM1ZzdhjYn9Rt52ODTEn3OtLW5Wp+nKGi9wHZ2Xa
+nrX2qTkjXVUP5PhbEvZID/OicDqTi4r9mkeyIMeaSzO7NhlYPxn5kF4DKcdaQz24
+iyodJ2CFZi8olQ8miMnv2e0yLUql+xrF0K1sLb17O88A4l17vTLT6zTaAQ5AwcBt
+mpp/z9fOanibX9Wu6ma+0WrDEQJO4vKC1UzkUa4o3ii/50qlG9y7mojnf2LRTyC4
+HVpdmWCR3X42U15rO+60XNAM6FiRrPg6K7zwz85QBZF88xtUHpr/QuZz3Q+2tjmH
+ikp+5jiOWQrIFokd5Yegud4lBZ8F2kSgQzsnKAJrdzGtayR9R+5W/QqnASBhK38G
+KgxAmY51cASuoTbrru5d5a19BXCO8iVWhTY4d7A4ufd0WHi0BjsXgATRU9fDZR+D
+hd65yC9ofNNNOowIP9uA
+=wTud
 -----END PGP SIGNATURE-----
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
-}