Drop unavailable configure option, move to eapi4.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index 34cb6f8c82af47a1b5a92078470456ee23c95a9c..44513ed1a3373bcd4226ac0f160978afe95a5c56 100644 (file)
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.65 2011/11/28 19:16:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.66 2011/12/29 16:38:05 pacho Exp $
+
+  29 Dec 2011; Pacho Ramos <pacho@gentoo.org> xchat-gnome-0.26.1-r2.ebuild:
+  Drop unavailable configure option, move to eapi4.
 
   28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
   xchat-gnome-0.26.1-r1.ebuild, xchat-gnome-0.26.1-r2.ebuild:

diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index 961bdaa2865dcc2ce9ac0917b9b2230a07463466..d193a1b119a4bdceceeab48aaf6e399fd591e8ca 100644 (file)
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -7,17 +7,13 @@ AUX xchat-gnome-0.26.1-multilib.patch 1315 RMD160 6680992a3744475c5eae10f4194ce3
 AUX xchat-gnome-0.26.1-ssl-automagic.patch 1956 RMD160 ee2141edf42c5e6ab449b07d881930402b2c82ab SHA1 a5036c173141495d70f6ae2831798992da949e7c SHA256 0305171eb02458ead2ade916c7f25e3486b94320d85d1cc2825040b33985ceb1
 DIST xchat-gnome-0.26.1.tar.bz2 1938676 RMD160 ff2228aa5258a2c5a3bd7c391e83a15b2f030aff SHA1 85d205baeca5f10be9245c582ae53fbb40a4ef17 SHA256 6234f14ddc7323faaa4f10f890786a0f69da00774855412a4382b11a6158cf4b
 EBUILD xchat-gnome-0.26.1-r1.ebuild 2177 RMD160 bbf8a47d5e22d2cbfe728d60f273b3b7bf02f31a SHA1 a87de5ffb4448cf5da850b0d6a36ead9b545100f SHA256 c6c45101b007f83798afb9843a60afc608126a59e89a794200436cab0a8e2d92
-EBUILD xchat-gnome-0.26.1-r2.ebuild 2385 RMD160 ab3586e9b9f29298282c477564d30ad357db83c5 SHA1 840ae7ce1580a4f2cdc47dcbf9c34434766a9d17 SHA256 419f278fe3a5dde418c7648e717240833e6a5c55c1734d7e40d1dbed82ced580
-MISC ChangeLog 10969 RMD160 b3e760b7e80b0510e8690da97d1cfd9ff0308833 SHA1 a2387bd05cc55e5734a9cd917129eb9e9ef06a41 SHA256 d4288a5aaf0cf6416d1bb9b357cbd6c8a0b7f1e0d3026e8a49636903c2eb77a5
+EBUILD xchat-gnome-0.26.1-r2.ebuild 2334 RMD160 2094914358a122632641a12576d38bddc742f05a SHA1 624728e2caf29e32e930cbee1f6c910966338fd4 SHA256 052b4f3e4dee2a0eec66e7fc755495c6ce39779e8412f146e4082d6828f026f0
+MISC ChangeLog 11094 RMD160 9de2931e177ebe39c359e6ef16560527ba6d2b91 SHA1 f7d794dcc980808decb547297dce9c3fd25822ad SHA256 ce646d84b9bff73b4ba09a5a15f81173edf1548d3f2a3d7f32cda3f8079a87c6
 MISC metadata.xml 179 RMD160 9d422d778271bb38d696f7d9045a4445d730b2a2 SHA1 ed52b66c15b2dd699d1e0518c5418b4906db06cc SHA256 bf1c049e4bdfc84d9c5f5cfdcc493b4cdeeda9b13e9d279a705c09fd457963c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO091qAAoJEEdUh39IaPFNW+MH/AtHvIzAArh5TOTTa75jqt0S
-pfNTg676ptc28R/tLCAszlXhpI73t111CH75T5r7a6cF0tPnLhfed8cqT1AhuQBD
-yAqihEj976IYnsiWS4DQDI31XpiOsI69teNirUZ3KIMcLxIjHABoeRpbpF334CUf
-MN0YCqPmi9i+eyBfWk8COpWNoQT+FeN7xS5kBvP3iO7yyualfENte1qgX9DAwahF
-KEC4OSiicNsriXmclAHR846ivS0pZ0VzT/lzFLmWas/vBDhmOrFIKbeKF0wOTkTQ
-HXp888oM4Wp984AzD0qmOitJ35KUU0wehwmLXBF2oGPQh/LGSTZ6nRVJNSnRwK4=
-=RJtJ
+iEYEARECAAYFAk78l3MACgkQCaWpQKGI+9QKzgCgh/dL2THIoVDbO8Gq0l6ZNkSZ
+MA8AmwfNsKlEtkkjYL7q+k0KSyFN8fUv
+=ABbj
 -----END PGP SIGNATURE-----

diff --git a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild
index b4762cdcd8c9095a74fa38b5c52491cde8d949dd..e4134fb2244d872d18aa1b555e0d06d0bdab5f1f 100644 (file)
--- a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild,v 1.3 2011/11/28 19:16:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild,v 1.4 2011/12/29 16:38:05 pacho Exp $
 
-EAPI=3
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 PYTHON_DEPEND="python? 2"
 
 inherit autotools eutils multilib gnome2 python
@@ -43,7 +45,6 @@ pkg_setup() {
        # Per configure.ac, shm is disable because of upstream bug #565958
        # --enable-shm
        G2CONF="${G2CONF}
-               --enable-gnomefe
                --enable-canberra
                --disable-schemas-install
                --disable-scrollkeeper
@@ -60,7 +61,10 @@ pkg_setup() {
 
        DOCS="AUTHORS ChangeLog NEWS"
 
-       use python && python_set_active_version 2
+       if use python; then
+               python_set_active_version 2
+               python_pkg_setup
+       fi
 }
 
 src_prepare() {
@@ -84,8 +88,5 @@ src_install() {
 
        # install plugin development header
        insinto /usr/include/xchat-gnome
-       doins src/common/xchat-plugin.h || die
-
-       # Not needed for plugins
-       find "${D}" -type f -name "*.la" -delete || die "la files removal failed"
+       doins src/common/xchat-plugin.h
 }