Fix build against glib-2.32 and latest gtk+extra, thanks a lot to Peter Volkov.

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

5 files changed, 72 insertions, 5 deletions

diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index 5fbd12723b2c..aabcb73aeeda 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/gpsim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.55 2012/05/03 02:35:37 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.56 2012/07/21 16:37:50 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gpsim-0.26.1-glib-single-include.patch,
+  +files/gpsim-0.26.1-gtkextra.patch, gpsim-0.26.1.ebuild:
+  Fix build against glib-2.32 and latest gtk+extra, thanks a lot to Peter
+  Volkov.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gpsim-0.24.0-r1.ebuild,
   gpsim-0.25.0.ebuild, gpsim-0.26.1.ebuild:
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 269c7e0bd0f1..45e3b527defc 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gpsim-0.26.1-glib-single-include.patch 437 SHA256 146ac18e1aaff6703c93b1ba84947c01abe984ec71a9b86029d3d5c1e57ae804 SHA512 112a1e42d91e5b52354541a06765a8c61a0b12f6989468298fcd3b1b62b29d6b6e49e32eb968b3660ed8eac31f565caaa7ad253e5e2cb24dadbf8eac8dffd15e WHIRLPOOL f66dae7a1a1868833fd0cbd76c95119444b00013787027d4164ac19b14f859838d5629def147efa97a15504dfab80fedb7426273da65d232c865c380ea1ced62
+AUX gpsim-0.26.1-gtkextra.patch 972 SHA256 e84be400696061b6f9821a27454f7ef625f1f452e600382017fa37a6641abf19 SHA512 9593de213cdb12058d18dd26f98dc6219f05e152e2a1628c693ee53326a26f67aadf6c98f09c80f93870363b8ada45379e31cf0af0ded820c235446a6feebfbb WHIRLPOOL 8078c7011f4a98676f4245ac06edecad4ca8b1b250ff5df1605798d9194814c5e75b70ed47b3fa88e450506edd72263ff63530b71c4c0cd99fa6d109369fb793
 DIST gpsim-0.24.0.tar.gz 1709240 SHA256 2ca3080e0af52f2a38ad9cf70362e314eaba40f4515b4660bbfa371d30471cf3 SHA512 acd8e5612280d30c003db05849aefbb02475a918ed979d26b28d3411adf2235c877b33712f04ce214b03d6a9629c0458b3a305583a822e437caed4254b75ee9a WHIRLPOOL 3155a205df74c5db11e4d0792a537df9e162084cca0aacfd4a62132ca4326a419a8ed287b7c29e25634712925a918568f57da14cb3909d3b11bdbc5ec60b2bcc
 DIST gpsim-0.25.0.tar.gz 2129337 SHA256 e13ae9785a9548d1b5abe5d6fb4bcc36ac2db5a48f40571633ebf35ee7692902 SHA512 60e2566263e3cd1df0e9f59cc28367a3c228b68e977c6d012a3cc3cdea68263d04b20ebc7ca42d3bd3a4c5a5f7a53fee94b172c72d37d071e6051126413c2e62 WHIRLPOOL 8da5ff1504e3453facdbc7d45900e6325427c8349d1ad4486ae48d7c34108a4b071845467bccbc884726d72551402d05843601f1df50b76f2187c7db3b5d38e2
 DIST gpsim-0.26.1.tar.gz 2350841 SHA256 509120f13971108f2f3e75706a354fb91cc777ad6b05244f26bded5e40a8b974 SHA512 ab710d57e5699e680674b97fb6c4eed19e45ee0bac05e40c2f8b4d58338b1023735e96aa7f9ce0c21048478d291a14fa41f216709b23d85d047d7c2b3e5e7d15 WHIRLPOOL 770f822c4547ef60e3dacc83b9d60db5bd7c0fb7819f3fc2e57b2841b4bbb53fd5f10da4d6da660c945be3497eee2f534c617b064c67a76d2c3f7c3d79524c66
 EBUILD gpsim-0.24.0-r1.ebuild 975 SHA256 fb1349bde9e2f3677d35c7e7aee6b1abd9582045d32a37c55cc4de898ade3e2c SHA512 9b243107fb3802556ce859a0a8ae60217bdaa553e502ed52ce9597d8edb07d52b468bc86f8411ea67d1372631e92aa05c2567a7777ba64c72bca7c72a29de829 WHIRLPOOL c685205a95fcafc98d167f7e9bfaa5fbddee4069762533f06b98bd0e9d7518c7e109bb6142bda5dfa494261142ec9a35042240e0cadaa691bc5264deabedbf2d
 EBUILD gpsim-0.25.0.ebuild 995 SHA256 ca1d3f2a4900fa3550f0803f68f3a2ead40864b1507527f1610f7b7b26ac8ce9 SHA512 2e090adc328818b09050a77996133391e6985a2e7637b3398dd89bb113c74e6773a5b3b9818012e51eb98c404c2c7a9c8e11cb6c1c170109d3dec8c651d951f4 WHIRLPOOL 4d1c98355ec0cfdf5a5416779b5e6ce751d881d3ea3c89ade9596395fe1a80daad44893b0ffe5a763d1c04de4d32933846ac4cbc3bca29dcf15921b6ae075674
-EBUILD gpsim-0.26.1.ebuild 1013 SHA256 16b681f929f74b51107275067185658613b88a73e9e33c9146d72504144b1e0d SHA512 898fea1d46642d3042d97ab30d97b6b72556f0375abc32f07b90f1f5890868c079c2a6bc139b46158f2ba3b005fbf6093169302c824132a7037fac561ab390d6 WHIRLPOOL 4961e3306ccb56795a3b763e0489cf8cd7bca1a1f735c3c5483861da8d7c9a08829f5f477d554f5177f5e788f80435f6c77ac7fa6cb3b16dfd25f28df55ad589
-MISC ChangeLog 8142 SHA256 4da7936e2e8d8816a6727cea0a492743f12aeb2896ba95e7d3f5361ba3ef13c6 SHA512 8c4d9cae8528427da444dc216c7a36183896054f9fd132bc5c119d02af6eb66d39fb5abc7eeab12634166cd86d1018a3becdf2fc1a8836cd7ae8b5aabae14a69 WHIRLPOOL 33ba61d27f89675e4b0ca238a6dcc4ceb9fc59e96a0138ad8ab9ef88e77cd95326bdf0a85cd41991bf44bd33f359172e6af9a89016c19ea60fc907f7082eeeee
+EBUILD gpsim-0.26.1.ebuild 1179 SHA256 b667c72d27ce82ba039aa434798d747e96e1ad7dcca01fb7930f5914e67926ea SHA512 16a244ca4c448aeb8be3fbfeb04f169b5445475affbadbb3f1ccdedf9e83c9d5aa1031aa715a21bc440fb19733df17bd748ecd47a994456dfa489831d92c5e30 WHIRLPOOL 291da71aa7170d89cec96aa106317fc0a894f1739195445ab51f0c188d05dda311bc28b528d73ee82d244762b5cf15fae3f5265bfb40ce543cd1cfd00c4da437
+MISC ChangeLog 8380 SHA256 66ffedfef27719335841a31b5ef5e18346e199ac7b41f71b3e76f163c932ad44 SHA512 701d36a88f769762496914d6be563d23c8eae7fd1d0eae01ff7422951b47929a6791fd8c8bae6b05319e52456e53aeb72c8908b98af3159250d46b44d3a05a12 WHIRLPOOL 1c5f2d0df15bbcec44dc6987611ea7bac4e0665c6b63cce09c756392bde38b67c700300d947d4154b750b8e7b355b0c1eb5095b2ddb6a99a4317f8fa7679c96d
 MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAK2uMACgkQCaWpQKGI+9QMKgCfbqDF7eiJEwzCCLEajs8vz/q/
+OqYAnAlIvUGhCn7ikHySLCFWM2UG0H4o
+=2V0W
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/gpsim/files/gpsim-0.26.1-glib-single-include.patch b/dev-embedded/gpsim/files/gpsim-0.26.1-glib-single-include.patch
new file mode 100644
index 000000000000..cd0f798281b5
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.26.1-glib-single-include.patch
@@ -0,0 +1,13 @@
+http://gpsim.svn.sourceforge.net/viewvc/gpsim/trunk/src/bitlog.h?r1=2107&r2=2182
+
+--- trunk/src/bitlog.h	2010/06/05 06:41:12	2107
++++ trunk/src/bitlog.h	2012/01/03 02:54:49	2182
+@@ -25,7 +25,7 @@
+ 
+ // include the absolute minimum portion of GLIB to get the definitions
+ // for guint64, etc.
+-#include <glibconfig.h>
++#include <glib.h>
+ 
+ /**********************************************************************
+  * boolean event logging
diff --git a/dev-embedded/gpsim/files/gpsim-0.26.1-gtkextra.patch b/dev-embedded/gpsim/files/gpsim-0.26.1-gtkextra.patch
new file mode 100644
index 000000000000..913290970516
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.26.1-gtkextra.patch
@@ -0,0 +1,29 @@
+=== modified file 'configure.ac'
+--- configure.ac	2012-06-02 20:11:32 +0000
++++ configure.ac	2012-06-02 20:11:44 +0000
+@@ -79,15 +79,20 @@
+ else
+   dnl gtk2 checks
+ 
+-  $PKGCONFIG --exists gtkextra-2.0
++  GTKEXTRAMOD="gtkextra-2.0"
++  $PKGCONFIG --exists $GTKEXTRAMOD
+   if test $? != 0; then
+-    AC_MSG_ERROR(Cannot find gtkextra-2.0 package)
++    GTKEXTRAMOD="gtkextra-3.0"
++    $PKGCONFIG --exists $GTKEXTRAMOD
++    if test $? != 0; then
++      AC_MSG_ERROR(Cannot find gtkextra-2.0 or gtkextra-3.0 package)
++    fi
+   fi
+ 
+   X_LDFLAGS=`$PKGCONFIG --libs gtk+-2.0 gthread-2.0`
+   X_CFLAGS=`$PKGCONFIG --cflags gtk+-2.0`
+-  Y_LDFLAGS=`$PKGCONFIG --libs gtkextra-2.0`
+-  Y_CFLAGS=`$PKGCONFIG --cflags gtkextra-2.0`
++  Y_LDFLAGS=`$PKGCONFIG --libs $GTKEXTRAMOD`
++  Y_CFLAGS=`$PKGCONFIG --cflags $GTKEXTRAMOD`
+   GTK_VERSION_T=`$PKGCONFIG --modversion gtk+-2.0`
+   echo linking with gtk-$GTK_VERSION_T
+   AC_DEFINE_UNQUOTED([GTK_VERSION],"$GTK_VERSION_T",[gtk version])
+
diff --git a/dev-embedded/gpsim/gpsim-0.26.1.ebuild b/dev-embedded/gpsim/gpsim-0.26.1.ebuild
index a2418fd53876..9e98a87ec55c 100644
--- a/dev-embedded/gpsim/gpsim-0.26.1.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.26.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.26.1.ebuild,v 1.2 2012/05/03 02:35:37 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.26.1.ebuild,v 1.3 2012/07/21 16:37:50 pacho Exp $
 
 EAPI=4
 
+inherit eutils autotools
 DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
 HOMEPAGE="http://gpsim.sourceforge.net"
 SRC_URI="mirror://sourceforge/gpsim/${P}.tar.gz"
@@ -25,6 +26,12 @@ DEPEND="${RDEPEND}
 
 DOCS=(ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO)
 
+src_prepare() {
+	epatch "${FILESDIR}/gpsim-0.26.1-glib-single-include.patch"
+	epatch "${FILESDIR}/gpsim-0.26.1-gtkextra.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable gtk gui) \
@@ -36,5 +43,5 @@ src_install() {
 	use doc && dodoc doc/gpsim.pdf
 
 	# remove useless .la files
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' +
+	use static-libs || find "${D}" -name '*.la' -exec rm -f '{}' +
 }