fix deprecation bug

5 files changed, 64 insertions, 22 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 326a0a1da355..fe27bda219f9 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.40 2004/12/11 11:04:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.41 2004/12/12 17:54:10 foser Exp $
+
+  12 Dec 2004; foser <foser@gentoo.org> gcalctool-4.4.{19,20}.ebuild :
+  Fix deprecated warnings (#73141)
 
   11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   gcalctool-4.4.19.ebuild:
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index 84f7a31f1659..b8ee2e84891e 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 add4e67ee9f831b2d7e2138a5916b813 gcalctool-4.4.20.ebuild 829
-MD5 9e0e7ee909f52fd5285c38f5e4f2e7e3 ChangeLog 4412
+MD5 fd00f16f38de2073a8dcd809fb95c588 gcalctool-4.4.19.ebuild 942
+MD5 41967be1e438854788e83fb10d35dc7f gcalctool-4.4.20.ebuild 937
 MD5 62c96a88f8c77014338a7c7e5455ea09 gcalctool-4.4.16.ebuild 801
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e9f4fe97f7c1e4836c8fa32bb1a4ff48 gcalctool-4.3.51.ebuild 792
-MD5 c156a0ece59af39d7169cc75b4bad288 gcalctool-4.4.19.ebuild 828
-MD5 16a23e780e431cedcd5a78e64aab35c3 files/digest-gcalctool-4.4.20 69
+MD5 994f6347c97b13076707c99239ca253b ChangeLog 4518
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 6e1a0ae918c3fb626ab667e5a27dec34 files/digest-gcalctool-4.3.51 69
-MD5 1dd84ed53f6ee664f736d2462b7dc50d files/digest-gcalctool-4.4.19 69
 MD5 4a20fd94b78401437382338647dde37d files/digest-gcalctool-4.4.16 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFButRmugEuf3OQ0akRArMVAKCDJFhdvNIC3fCyndm4Y2tRoXB/3QCfcHVE
-gc4GrOR9RK+nCno1DYtlZGI=
-=mkgN
------END PGP SIGNATURE-----
+MD5 1dd84ed53f6ee664f736d2462b7dc50d files/digest-gcalctool-4.4.19 69
+MD5 16a23e780e431cedcd5a78e64aab35c3 files/digest-gcalctool-4.4.20 69
+MD5 84697b19eaf743396f6d59b86a058b66 files/gcalctool-4.4.20-remove_disable_deprecated.patch 1289
diff --git a/gnome-extra/gcalctool/files/gcalctool-4.4.20-remove_disable_deprecated.patch b/gnome-extra/gcalctool/files/gcalctool-4.4.20-remove_disable_deprecated.patch
new file mode 100644
index 000000000000..6738d16634be
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-4.4.20-remove_disable_deprecated.patch
@@ -0,0 +1,30 @@
+diff -uNr gcalctool-4.4.20/gcalctool/Makefile.am gcalctool-4.4.20.depr/gcalctool/Makefile.am
+--- gcalctool-4.4.20/gcalctool/Makefile.am	2004-06-09 19:33:20.000000000 +0200
++++ gcalctool-4.4.20.depr/gcalctool/Makefile.am	2004-12-12 18:41:11.906241520 +0100
+@@ -2,11 +2,6 @@
+ 
+ INCLUDES = \
+ 	-I$(includedir) \
+-	-DGNOME_DISABLE_DEPRECATED \
+-	-DG_DISABLE_DEPRECATED \
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ 	-DPACKAGE_PIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \
+diff -uNr gcalctool-4.4.20/gcalctool/Makefile.in gcalctool-4.4.20.depr/gcalctool/Makefile.in
+--- gcalctool-4.4.20/gcalctool/Makefile.in	2004-10-12 18:44:48.000000000 +0200
++++ gcalctool-4.4.20.depr/gcalctool/Makefile.in	2004-12-12 18:41:19.871030688 +0100
+@@ -228,11 +228,6 @@
+ target_alias = @target_alias@
+ INCLUDES = \
+ 	-I$(includedir) \
+-	-DGNOME_DISABLE_DEPRECATED \
+-	-DG_DISABLE_DEPRECATED \
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ 	-DPACKAGE_PIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \
diff --git a/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild b/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
index 0090e33784a2..d91b4dd7a762 100644
--- a/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild,v 1.7 2004/12/11 11:04:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild,v 1.8 2004/12/12 17:54:10 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A scientific calculator for Gnome2"
 HOMEPAGE="http://calctool.sourceforge.net/"
@@ -24,6 +24,15 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-4.4.20-remove_disable_deprecated.patch
+
+}
+
 src_install() {
 
 	gnome2_src_install
diff --git a/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild b/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild
index 583e9f83851e..0be6bbdf682d 100644
--- a/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild,v 1.1 2004/11/25 04:58:19 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild,v 1.2 2004/12/12 17:54:10 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A scientific calculator for Gnome2"
 HOMEPAGE="http://calctool.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips ~arm"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips ~arm"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2
@@ -24,6 +24,15 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-remove_disable_deprecated.patch
+
+}
+
 src_install() {
 
 	gnome2_src_install