old

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 6 insertions, 130 deletions

diff --git a/dev-util/desktop-file-utils/ChangeLog b/dev-util/desktop-file-utils/ChangeLog
index 9966dcb0070a..8ea9cd1ddb51 100644
--- a/dev-util/desktop-file-utils/ChangeLog
+++ b/dev-util/desktop-file-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/desktop-file-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.116 2012/04/05 07:10:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.117 2012/04/20 21:14:30 ssuominen Exp $
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -desktop-file-utils-0.18.ebuild, -files/desktop-file-utils-0.18-unity.patch,
+  -desktop-file-utils-0.20.ebuild:
+  old
 
 *desktop-file-utils-0.20-r1 (05 Apr 2012)
 
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild
deleted file mode 100644
index 450851c21d0d..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild,v 1.7 2011/12/02 22:05:32 ssuominen Exp $
-
-EAPI=4
-inherit elisp-common eutils
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="http://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-unity.patch
-	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
-}
-
-src_configure() {
-	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.20.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.20.ebuild
deleted file mode 100644
index 00f9e6a3a0bd..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.20.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.20.ebuild,v 1.1 2012/03/06 08:45:59 ssuominen Exp $
-
-EAPI=4
-inherit elisp-common
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="http://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
-}
-
-src_configure() {
-	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.18-unity.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.18-unity.patch
deleted file mode 100644
index be1b35e23b19..000000000000
--- a/dev-util/desktop-file-utils/files/desktop-file-utils-0.18-unity.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 47322e554cc5388a3e6325f36b7d07a13f124594 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Thu, 31 Mar 2011 16:28:44 +0000
-Subject: Add Unity to list of registered environments
-
-See http://lists.freedesktop.org/archives/xdg/2011-March/011856.html
----
-diff --git a/src/validate.c b/src/validate.c
-index 04bc8d0..9c399a3 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -338,7 +338,7 @@ static struct {
- };
- 
- static const char *show_in_registered[] = {
--  "GNOME", "KDE", "LXDE", "ROX", "XFCE", "Old"
-+  "GNOME", "KDE", "LXDE", "ROX", "Unity", "XFCE", "Old"
- };
- 
- static struct {
---
-cgit v0.9.0.2-2-gbebe