various cleanups, also fixes bug 450294

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 113 insertions, 3 deletions

diff --git a/app-editors/efte/ChangeLog b/app-editors/efte/ChangeLog
index 53e9e4795782..d985a653a4c8 100644
--- a/app-editors/efte/ChangeLog
+++ b/app-editors/efte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/efte
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/efte/ChangeLog,v 1.11 2012/05/10 14:53:07 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/efte/ChangeLog,v 1.12 2013/01/04 20:43:19 hasufell Exp $
+
+*efte-1.1-r1 (04 Jan 2013)
+
+  04 Jan 2013; Julian Ospald <hasufell@gentoo.org> +efte-1.1-r1.ebuild,
+  +files/efte-1.1-desktopfile.patch, +files/efte-1.1-flags.patch:
+  various cleanups, also fixes bug 450294
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -efte-1.0.ebuild:
   Remove old
diff --git a/app-editors/efte/Manifest b/app-editors/efte/Manifest
index 49e1c8ada5c7..1644292e74c1 100644
--- a/app-editors/efte/Manifest
+++ b/app-editors/efte/Manifest
@@ -1,4 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX efte-1.1-desktopfile.patch 619 SHA256 b36601d89605cae5956ffcc9acfce1ef0efa16491b700c4460b96838ad82402b SHA512 e48df45d0daa6264503c94a7d2d6c886b6101f5d258fbc3a3825377f25b601b3f8869a4337330ea325a44086db20b2c2906f3556b5e066b1f399afe3aadcdc98 WHIRLPOOL db7aef8d4a2f616b0e86e66df0105d7a0daf6ddeae7fac77329bcd648a6849f94c81be4474e4bd01714928914687025ce6dcae0c0a743ab4fd1a9a870d77c806
+AUX efte-1.1-flags.patch 657 SHA256 4bcbecc5be94ebff43ffbc8abfab46c7a7ade70458cb89c86a98f7806fea646f SHA512 7721010873e2030428f2c855d35b18ce6c6ab2d884c25e1611045e8d3209cb0baf94a7d90661de6ea86d084e9b73cf4b8ac724308f94263adbad12db2507a870 WHIRLPOOL e0aaf9989870e3ff4eaf2efe3231f400ed28e4786df471b5fc6d921853c0ef333b5b41491935ef402805232e1d934df0e0835a99026841d3d4de44ec0045a4fa
 DIST efte-1.1.tar.bz2 429919 SHA256 b71b9301dc781555bd9f4c73d7d81eb92701ccd5119b17da9b86ede402d31e16 SHA512 4dbfcaaadc56996d1b4659db2a82ec5132cf45b6f65ef545274769aa47f44ba27a8af1488ed57e5ffec2d9f5f1d1ef4cb9ee97514414796f176c2272a6bb6661 WHIRLPOOL 0d14d090767d55fb6d46d183e5ff9b43ecc9aacfe8171c63c1e15f0fc10bc562cde196cd06589515ba97429d195d2927df085b799c793a21dda0fee37d84190f
+EBUILD efte-1.1-r1.ebuild 1193 SHA256 3bdd78c092fbf886ab203b8035dc24585f1daf65c0f371a1514f0b2da295cacc SHA512 efc91517a0533343eea2a5d8c3c3bf2da084728d1c15e0cc1769c5c7291409e65312d4bc08b24705907a9be2634cf6f46d69a3d02620fb38813def638743654b WHIRLPOOL 196e377171b83a06264ec57c1b75329fdc5f64d16dd3d5bbcb15f093471005d88a674fec1105a94ceeeb55d44664767e9ca8504b5c0451b14765ef8bb94d8837
 EBUILD efte-1.1.ebuild 924 SHA256 d18530e62923f2859d26ce453b9f8a9c79ce64852405ed693a0ab77cd7c1a1b5 SHA512 7240a67968736a1d1fdc1142bdb67d769c44b9bd8306761fc1e645c3c3ea4de263043ed6cf5c365930232cd0a7a22f82bdde3a976fe12a15c79be91c8c125ca1 WHIRLPOOL 722b92450b060e5a94a3cf2c7ee93c169af56bd9a215814a5cffae7b98635300041eb0790c334eb304f3502274c3de73562258db8855ec82c7d5e2f5e0b8bde0
-MISC ChangeLog 1511 SHA256 ee78c8c1b0bad23a540720c42d77a30a337c04582227c5b0536158da0fc1051a SHA512 ab21081cd4bedf01d671d1dc9bae81433ae2dc57b5eadf7fdb3f31e12766f0a9c60f0e4656b10851b2a1d94ccd7bdf24dd889fbaac27b452213537ee0154995f WHIRLPOOL baf09ed8c75591d71d3e05263f026583a7062775a04b902f4abb7ce53710f3fcaa11bd21d2204dc6f18d82f4b548e4ad09082b6c33891e7b219c64d7281b5b5f
+MISC ChangeLog 1725 SHA256 9ffb0febb99f89f12e228821a2e81e5f80e28946b6d0dd106ce4b62a86311bb5 SHA512 169952a128f057c98310a1b265057b1c3091aab5689703c132cb2de61f9d1874f4b89164b2e75a082ed1e0326729d52ca70c3b56e1a6e6a152ccdd6ca9c5c541 WHIRLPOOL adfa887b6d24ad1751019113e97c43729e524f364af3ea4a823cd35e1f8cbdfcc39eba5283a48ccdf055d8d85536d90cdbaf84bd1da703fb89d4cc8e5ddf8314
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ5z7oAAoJEFpvPKfnPDWzMHAH/34F73+zQDjGSQSw9Dj+Vf+r
+yp+D3GYyhxT/NYWhx1wApphSMUmTNit16fkT+4Da9krGBkpXHZR+sBmErwjEbVLq
+meP8p6h09YDdtO0XDP7irEx9voGJbnx374r4lexffeqgzN8ljgGhZWuv3lYBdtaJ
+IoucjeMiV3OH/i9uXX8EC+e0Q5bR0oA74DYKQt9NTvSMAyxzp3d8DNn7nZfKzyli
+xhfTfUxzRaQFpYyK2wE2LJJO76hNifhAVfvurVNUHFFGo2nnd2jAkxAOxsb0ZlI+
+7CQHBE2fjK9ThlXDh93RYYhrSKVSK+kfit3EqJyCTvQCGORn2TVwGxMAc4zK+x4=
+=YqmY
+-----END PGP SIGNATURE-----
diff --git a/app-editors/efte/efte-1.1-r1.ebuild b/app-editors/efte/efte-1.1-r1.ebuild
new file mode 100644
index 000000000000..23fb72c579ab
--- /dev/null
+++ b/app-editors/efte/efte-1.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/efte/efte-1.1-r1.ebuild,v 1.1 2013/01/04 20:43:19 hasufell Exp $
+
+EAPI=5
+
+inherit eutils cmake-utils fdo-mime
+
+DESCRIPTION="A fast text editor supporting folding, syntax highlighting, etc."
+HOMEPAGE="http://efte.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpm X"
+
+RDEPEND="sys-libs/ncurses
+	gpm? ( sys-libs/gpm )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXdmcp
+		x11-libs/libXau
+		media-fonts/font-misc-misc
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-desktopfile.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build gpm)
+		$(cmake-utils_use_build X)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -f "${D}"/usr/share/doc/${PN}/{COPYING,Artistic}
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-editors/efte/files/efte-1.1-desktopfile.patch b/app-editors/efte/files/efte-1.1-desktopfile.patch
new file mode 100644
index 000000000000..79cfc1c0ab34
--- /dev/null
+++ b/app-editors/efte/files/efte-1.1-desktopfile.patch
@@ -0,0 +1,18 @@
+--- efte-1.1/packaging/shared/efte.desktop
++++ efte-1.1/packaging/shared/efte.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Name=eFTE
+-Version=1.1
+ GenericName=Text Editor
+ GenericName[cz]=Textový editor
+ GenericName[de]=Texteditor
+@@ -29,7 +28,7 @@
+ Comment[sv]=Snabb, utbyggbar textredigerare för programmerare
+ MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+ Exec=efte %f
+-Icon=efte
++Icon=efte48x48
+ Type=Application
+ Terminal=false
+ Categories=Development;TextEditor;
diff --git a/app-editors/efte/files/efte-1.1-flags.patch b/app-editors/efte/files/efte-1.1-flags.patch
new file mode 100644
index 000000000000..10c17cff322c
--- /dev/null
+++ b/app-editors/efte/files/efte-1.1-flags.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Jan  4 20:17:34 UTC 2013
+Subject: respect system CXXFLAGS
+
+--- efte-1.1/src/CMakeLists.txt
++++ efte-1.1/src/CMakeLists.txt
+@@ -86,7 +86,7 @@
+ ENDIF( UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+ 
+ IF( CMAKE_COMPILER_IS_GNUCC )
+-  SET( CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-long-long -Wpointer-arith -Wconversion -Wwrite-strings -Winline -fno-rtti -fno-exceptions" )
++  SET( CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-long-long -Wpointer-arith -Wconversion -Wwrite-strings -Winline -fno-rtti -fno-exceptions ${CMAKE_CXX_FLAGS}" )
+ ENDIF( CMAKE_COMPILER_IS_GNUCC )
+ 
+ IF( CMAKE_SYSTEM_NAME MATCHES "HP/UX" )