Drop old emerald versions

Package-Manager: portage-2.2.0_alpha129/cvs/Linux x86_64

4 files changed, 6 insertions, 102 deletions

diff --git a/x11-wm/emerald/ChangeLog b/x11-wm/emerald/ChangeLog
index f9f924659f2b..032df4ccf8a6 100644
--- a/x11-wm/emerald/ChangeLog
+++ b/x11-wm/emerald/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/emerald
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.41 2012/08/30 12:00:01 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.42 2012/09/25 14:30:20 pinkbyte Exp $
+
+  25 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -emerald-0.8.4-r2.ebuild,
+  -files/emerald-0.8.4-gtk+-2.20-build.patch,
+  -files/emerald-0.8.4-pkgconfig-pollution.patch:
+  Drop old
 
   30 Aug 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Remove myself and proxy mainainer from maintainers, leaving only herd
diff --git a/x11-wm/emerald/emerald-0.8.4-r2.ebuild b/x11-wm/emerald/emerald-0.8.4-r2.ebuild
deleted file mode 100644
index a0d4b7574765..000000000000
--- a/x11-wm/emerald/emerald-0.8.4-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r2.ebuild,v 1.5 2012/05/04 08:58:57 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils
-
-THEMES_RELEASE=0.5.2
-
-DESCRIPTION="Emerald Window Decorator"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.8.0:2
-	>=x11-libs/libwnck-2.14.2:1
-	>=x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-"
-
-src_prepare() {
-	# Fix pkg-config file pollution wrt #380197
-	epatch "${FILESDIR}"/${P}-pkgconfig-pollution.patch
-	# Fixing GTK symbol - bug 308791.
-	epatch "${FILESDIR}/${P}-gtk+-2.20-build.patch"
-	# fix build with gtk+-2.22 - bug 341143
-	sed -i -e '/#define G[DT]K_DISABLE_DEPRECATED/s:^://:' \
-		include/emerald.h || die
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		--enable-fast-install \
-		--disable-mime-update || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch b/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch
deleted file mode 100644
index 3dc7bf4488ad..000000000000
--- a/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN emerald-0.8.4/libengine/themer.c emerald-0.8.4.new/libengine/themer.c
---- emerald-0.8.4/libengine/themer.c	2009-10-13 20:56:23.000000000 -0400
-+++ emerald-0.8.4.new/libengine/themer.c	2010-03-10 01:20:03.046827674 -0500
-@@ -461,7 +461,7 @@
- }
- gdouble get_float(SettingItem * item)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
-     }
-     else {
-@@ -647,7 +647,7 @@
- }
- void set_float(SettingItem * item, gdouble f)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
-     } 
-     else {
---- emerald-0.8.4/src/main.c.old	2010-03-29 19:49:30.420710030 -0700
-+++ emerald-0.8.4/src/main.c	2010-03-29 19:52:33.654024944 -0700
-@@ -3757,7 +3757,7 @@
- 
- static void hide_tooltip(void)
- {
--    if (GTK_WIDGET_VISIBLE(tip_window))
-+    if (gtk_widget_get_visible(tip_window))
- 	g_get_current_time(&tooltip_last_popdown);
- 
-     gtk_widget_hide(tip_window);
-
diff --git a/x11-wm/emerald/files/emerald-0.8.4-pkgconfig-pollution.patch b/x11-wm/emerald/files/emerald-0.8.4-pkgconfig-pollution.patch
deleted file mode 100644
index 047d8dfad786..000000000000
--- a/x11-wm/emerald/files/emerald-0.8.4-pkgconfig-pollution.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libengine/emeraldengine.pc.in
-+++ libengine/emeraldengine.pc.in
-@@ -7,6 +7,7 @@
- Description: Library for Emerald Engines
- Version: @VERSION@
- 
--Requires: @EMERALD_REQUIRES@
--Libs: @EMERALD_LIBS@
-+Requires.private: @EMERALD_REQUIRES@
-+Libs: -L${libdir} -lemeraldengine
-+Libs.private: @EMERALD_LIBS@
- Cflags: @EMERALD_CFLAGS@ -I${includedir}/emerald