Remove private Glib::KeyFile usage as >=glibmm-2.14 provides an alternative, #204624

Package-Manager: portage-2.1.3_rc8

5 files changed, 116 insertions, 6 deletions

diff --git a/app-editors/amyedit/ChangeLog b/app-editors/amyedit/ChangeLog
index 8d4c7b4f3b62..d36f061c3abc 100644
--- a/app-editors/amyedit/ChangeLog
+++ b/app-editors/amyedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/amyedit
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/amyedit/ChangeLog,v 1.14 2007/10/11 18:48:29 remi Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/amyedit/ChangeLog,v 1.15 2008/01/07 14:18:52 pclouds Exp $
+
+*amyedit-1.0-r1 (07 Jan 2008)
+
+  07 Jan 2008; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
+  +files/amyedit-1.0-keyfile.patch, +amyedit-1.0-r1.ebuild:
+  Remove private Glib::KeyFile usage as >=glibmm-2.14 provides an alternative,
+  #204624
 
   11 Oct 2007; Rémi Cardona <remi@gentoo.org> amyedit-0.9.ebuild,
   amyedit-1.0.ebuild:
diff --git a/app-editors/amyedit/Manifest b/app-editors/amyedit/Manifest
index 72faeb643a22..2031a064493a 100644
--- a/app-editors/amyedit/Manifest
+++ b/app-editors/amyedit/Manifest
@@ -1,17 +1,25 @@
+AUX amyedit-1.0-keyfile.patch 2123 RMD160 0b2a6411240e340b20ca487cdf751321732ede64 SHA1 93a443fc0935eb49f09464979bebc41b2eace74e SHA256 aef655d331cca213d85f6f939b70604511d7b891e33834390d250ed08b9c577a
+MD5 ebc4feccd69709288a7e55fb1e502255 files/amyedit-1.0-keyfile.patch 2123
+RMD160 0b2a6411240e340b20ca487cdf751321732ede64 files/amyedit-1.0-keyfile.patch 2123
+SHA256 aef655d331cca213d85f6f939b70604511d7b891e33834390d250ed08b9c577a files/amyedit-1.0-keyfile.patch 2123
 DIST amyedit-0.9.tar.bz2 246702 RMD160 5971ec3848cb1195ca4c147c4f4e2bca1e087bb7 SHA1 d073e6b01c047d1d1e09f8835c5da8b07c8ca25c SHA256 0051546f68d63e4a8f087a68dcfe29fbeeaf82727bed9f39045ffdf6b4b60949
 DIST amyedit-1.0.tar.bz2 297769 RMD160 b08ee643f2e6021e6ad7a3382c394106ea504298 SHA1 2ca1c7910b231e782596548622a51de96e1bd090 SHA256 9aa88340266827bd83715d495b7e1f2c1ca7100ff9f7586877c1b4d3ec67f228
 EBUILD amyedit-0.9.ebuild 562 RMD160 b3e713ec16cec5c30ffed23e5a302038c24da6d9 SHA1 4e6930cffaa6968add91d828a9f92a8b2275b39e SHA256 da78a26d86436299fadaa4c77ae11a5cd6d0e4a5c438786edea79f63d59f9de4
 MD5 804d257f8d3a61e06572b4531e849753 amyedit-0.9.ebuild 562
 RMD160 b3e713ec16cec5c30ffed23e5a302038c24da6d9 amyedit-0.9.ebuild 562
 SHA256 da78a26d86436299fadaa4c77ae11a5cd6d0e4a5c438786edea79f63d59f9de4 amyedit-0.9.ebuild 562
+EBUILD amyedit-1.0-r1.ebuild 662 RMD160 e65ce1144ece79d83ad52e0b7eebc0fb9191e63d SHA1 539b438f52dbda571fdc230c1596824f857ea5c3 SHA256 d30fd6977f6b4867af3074588d8f08f10a18e6d4231676929c9d3bf25b99c14b
+MD5 4514f32f2652f0434df4423ea1d92543 amyedit-1.0-r1.ebuild 662
+RMD160 e65ce1144ece79d83ad52e0b7eebc0fb9191e63d amyedit-1.0-r1.ebuild 662
+SHA256 d30fd6977f6b4867af3074588d8f08f10a18e6d4231676929c9d3bf25b99c14b amyedit-1.0-r1.ebuild 662
 EBUILD amyedit-1.0.ebuild 561 RMD160 7f93c588f42eb8925ae316012758dc976151e772 SHA1 8a6d4b34fe4d18867abfdc91369493a47a2eeed3 SHA256 2ddd5bf5903b3733b70f9525ba938098b431c1958a5db7516f898b5a08b83c74
 MD5 bd65f0d86e2d36604eb20a835d1c8237 amyedit-1.0.ebuild 561
 RMD160 7f93c588f42eb8925ae316012758dc976151e772 amyedit-1.0.ebuild 561
 SHA256 2ddd5bf5903b3733b70f9525ba938098b431c1958a5db7516f898b5a08b83c74 amyedit-1.0.ebuild 561
-MISC ChangeLog 1720 RMD160 4403af81f606ad26794832776ba1bbd43f61db88 SHA1 dd202dafff80e455f2aecba92b547902b53f8f7d SHA256 954c2e239102f0a0f16ac107bd33ab7bdf6c39dc180f692d9d7146a391c42542
-MD5 50b23d3b1baa412704a84d81ac99457a ChangeLog 1720
-RMD160 4403af81f606ad26794832776ba1bbd43f61db88 ChangeLog 1720
-SHA256 954c2e239102f0a0f16ac107bd33ab7bdf6c39dc180f692d9d7146a391c42542 ChangeLog 1720
+MISC ChangeLog 1966 RMD160 175e0170bbb9c1a5dea29b94b0ae3618af2874ac SHA1 39ec99ac1d1b085b876104b690054976997fbaf4 SHA256 6e8c00b204e15d9d8b932ec4338e209e4c0e60e0aa3decdd5747fd5ae27a22f7
+MD5 295018c361914e8a9a1ddce750928c06 ChangeLog 1966
+RMD160 175e0170bbb9c1a5dea29b94b0ae3618af2874ac ChangeLog 1966
+SHA256 6e8c00b204e15d9d8b932ec4338e209e4c0e60e0aa3decdd5747fd5ae27a22f7 ChangeLog 1966
 MISC metadata.xml 222 RMD160 db5191fdf5292385dd274e20e24ce9494e879188 SHA1 086456c6f32463c2ce37904740bb3f15c00bf349 SHA256 d3286f1a4c1ad3e7319fffb79a7879383fa2ced13f5b724e8a20af3de7f33d5e
 MD5 87e7766b6f6fd438109b204e64d1ac93 metadata.xml 222
 RMD160 db5191fdf5292385dd274e20e24ce9494e879188 metadata.xml 222
@@ -22,3 +30,6 @@ SHA256 14fa68e5ab76e9813e5adeeced613061d62d0995d409afcc61995a5bc85dd499 files/di
 MD5 2bc19f6fa887a269596ec420b365d109 files/digest-amyedit-1.0 238
 RMD160 3aa5c61241f7f09f7718550b95deae972a3d2fec files/digest-amyedit-1.0 238
 SHA256 87cffd4565e765b28cf62cf1db0d58eada39c71b296b8d02d6387fa8b4a9683b files/digest-amyedit-1.0 238
+MD5 2bc19f6fa887a269596ec420b365d109 files/digest-amyedit-1.0-r1 238
+RMD160 3aa5c61241f7f09f7718550b95deae972a3d2fec files/digest-amyedit-1.0-r1 238
+SHA256 87cffd4565e765b28cf62cf1db0d58eada39c71b296b8d02d6387fa8b4a9683b files/digest-amyedit-1.0-r1 238
diff --git a/app-editors/amyedit/amyedit-1.0-r1.ebuild b/app-editors/amyedit/amyedit-1.0-r1.ebuild
new file mode 100644
index 000000000000..f5a271cc258c
--- /dev/null
+++ b/app-editors/amyedit/amyedit-1.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/amyedit/amyedit-1.0-r1.ebuild,v 1.1 2008/01/07 14:18:52 pclouds Exp $
+
+inherit eutils
+
+DESCRIPTION=" AmyEdit is a LaTeX editor"
+HOMEPAGE="http://amyedit.sf.net"
+SRC_URI="mirror://sourceforge/amyedit/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND=">=dev-cpp/gtkmm-2.6
+	>=dev-cpp/glibmm-2.14
+	=x11-libs/gtksourceview-1*
+	app-text/aspell"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-keyfile.patch"
+}
+
+src_install() {
+	einstall
+	dodoc ChangeLog README TODO || die
+}
diff --git a/app-editors/amyedit/files/amyedit-1.0-keyfile.patch b/app-editors/amyedit/files/amyedit-1.0-keyfile.patch
new file mode 100644
index 000000000000..fb9f9ac908fc
--- /dev/null
+++ b/app-editors/amyedit/files/amyedit-1.0-keyfile.patch
@@ -0,0 +1,62 @@
+diff -ur amyedit-1.0/src/main.cc amyedit-1.0.new/src/main.cc
+--- amyedit-1.0/src/main.cc	2006-03-14 06:08:32.000000000 +0700
++++ amyedit-1.0.new/src/main.cc	2008-01-07 20:45:39.000000000 +0700
+@@ -54,7 +54,6 @@
+ 
+ #include "AmyEdit.hh"
+ #include "gtksourceviewmm/init.hh"
+-#include "gtkmm_extra/keyfile.h"
+ #include "Utils.hh"
+ 
+ int main(int argc, char **argv)
+@@ -65,7 +64,6 @@
+ 	
+ 	Gtk::Main m(&argc, &argv);
+ 	Gtk::SourceViewmm_init();
+-	Glib::keyfile_init();
+ 
+ 	/* TODO This should probably be removed and created on demand */
+ 	
+Only in amyedit-1.0.new/src: main.o
+Only in amyedit-1.0.new/src: Makefile
+diff -ur amyedit-1.0/src/Makefile.am amyedit-1.0.new/src/Makefile.am
+--- amyedit-1.0/src/Makefile.am	2006-03-08 05:44:53.000000000 +0700
++++ amyedit-1.0.new/src/Makefile.am	2008-01-07 20:41:46.000000000 +0700
+@@ -30,8 +30,7 @@
+ 		gtksourceviewmm/sourcelanguage.cpp           \
+ 		gtksourceviewmm/sourcelanguagesmanager.cpp   \
+ 		gtksourceviewmm/sourceview.cpp               \
+-		gtksourceviewmm/init.cc                      \
+-		gtkmm_extra/keyfile.cc
++		gtksourceviewmm/init.cc
+ 
+ headers =  \
+ 		AboutDialog.hh               \
+@@ -54,15 +53,13 @@
+ 		gtksourceviewmm/sourcelanguage.h            \
+ 		gtksourceviewmm/sourcelanguagesmanager.h    \
+ 		gtksourceviewmm/sourceview.h                \
+-		gtksourceviewmm/init.hh                     \
+-		gtkmm_extra/keyfile.h
++		gtksourceviewmm/init.hh
+ 
+ privateheaders=  \
+ 		gtksourceviewmm/private/sourcebuffer_p.h            \
+ 		gtksourceviewmm/private/sourcelanguage_p.h          \
+ 		gtksourceviewmm/private/sourcelanguagesmanager_p.h  \
+ 		gtksourceviewmm/private/sourceview_p.h              \
+-		gtkmm_extra/private/keyfile_p.h                     \
+ 		Utils_p.hh
+ 
+ if PRECOMPILE_HEADERS
+diff -ur amyedit-1.0/src/PrefStruct.hh amyedit-1.0.new/src/PrefStruct.hh
+--- amyedit-1.0/src/PrefStruct.hh	2006-03-09 06:54:41.000000000 +0700
++++ amyedit-1.0.new/src/PrefStruct.hh	2008-01-07 20:46:32.000000000 +0700
+@@ -24,7 +24,6 @@
+ 
+ #include "Preferences.hh"
+ #include <glibmm/ustring.h>
+-#include <gtkmm_extra/keyfile.h>
+ #include <iostream>
+ 
+ class PrefStruct 
diff --git a/app-editors/amyedit/files/digest-amyedit-1.0-r1 b/app-editors/amyedit/files/digest-amyedit-1.0-r1
new file mode 100644
index 000000000000..1f24a2e0d1ca
--- /dev/null
+++ b/app-editors/amyedit/files/digest-amyedit-1.0-r1
@@ -0,0 +1,3 @@
+MD5 662f5d6cc37c5838e2dc5a4a6abb812d amyedit-1.0.tar.bz2 297769
+RMD160 b08ee643f2e6021e6ad7a3382c394106ea504298 amyedit-1.0.tar.bz2 297769
+SHA256 9aa88340266827bd83715d495b7e1f2c1ca7100ff9f7586877c1b4d3ec67f228 amyedit-1.0.tar.bz2 297769