public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gpsim/, dev-embedded/gpsim/files/
@ 2016-08-25 21:35 Tim Harder
  0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2016-08-25 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     a297e994293dca6ec626d1994d8263433701f78d
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 21:18:44 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 21:33:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a297e994

dev-embedded/gpsim: version bump to 0.29.0

 dev-embedded/gpsim/Manifest                     |  1 +
 dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch | 13 ++++++++
 dev-embedded/gpsim/gpsim-0.29.0.ebuild          | 43 +++++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index fe883ce..6b6bf0e 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,2 +1,3 @@
 DIST gpsim-0.26.1.tar.gz 2350841 SHA256 509120f13971108f2f3e75706a354fb91cc777ad6b05244f26bded5e40a8b974 SHA512 ab710d57e5699e680674b97fb6c4eed19e45ee0bac05e40c2f8b4d58338b1023735e96aa7f9ce0c21048478d291a14fa41f216709b23d85d047d7c2b3e5e7d15 WHIRLPOOL 770f822c4547ef60e3dacc83b9d60db5bd7c0fb7819f3fc2e57b2841b4bbb53fd5f10da4d6da660c945be3497eee2f534c617b064c67a76d2c3f7c3d79524c66
 DIST gpsim-0.27.0.tar.gz 2465642 SHA256 204ed2a8aaf1b3021617544330997f4a508b811afce71fb9628b94406d5e59a2 SHA512 769a49d069cf24f0555ed6b34241139e69398fae1e01981298cd49a6096b8f196dfd9e6d8dfebf3f93294b3ca2acf9c4b1b21be600b5d0dd65dd99b6b159f06b WHIRLPOOL 2146a2cfa79a93b84d5caa014c7c639a4b9d97fbe179f18af697fadee7454aa4c4f379d4d0fe1e48c446bf411faffeef5aa6c4caeb268aa7c37c1f5b8953ba63
+DIST gpsim-0.29.0.tar.gz 3301050 SHA256 9ed078038da80dab117e803467d3df3818fa84af7a4a289aaac295913a30615d SHA512 f24997e7bc360afbc87f9cc1e36cf5fa25aecf23c21ba043eabb333b5de9ddfa24b1373fdaa48ba8043a7fcda72558d54691db2579345255dd453e94b3752920 WHIRLPOOL bc49858b811751cebdd54e5e5b2e5b3f29fd3ac8eabbebba659fed50fdd7e9b47f87d3279be3190522fea1fd45edff21c0d0078a9f51ab0228796a949b986085

diff --git a/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch b/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
new file mode 100644
index 00000000..b055e01
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
@@ -0,0 +1,13 @@
+--- gpsim-0.29.0/modules/logic.cc
++++ gpsim-0.29.0/modules/logic.cc
+@@ -269,8 +269,10 @@
+ 
+ LogicGate::~LogicGate()
+ {
++#ifdef HAVE_GUI
+   if (pixbuf)
+     g_object_unref(pixbuf);
++#endif
+ }
+ 
+ //--------------------------------------------------------------

diff --git a/dev-embedded/gpsim/gpsim-0.29.0.ebuild b/dev-embedded/gpsim/gpsim-0.29.0.ebuild
new file mode 100644
index 00000000..cd61a76
--- /dev/null
+++ b/dev-embedded/gpsim/gpsim-0.29.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
+HOMEPAGE="http://gpsim.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc gtk static-libs"
+
+RDEPEND=">=dev-embedded/gputils-0.12
+	!dev-embedded/gpsim-lcd
+	dev-libs/glib:2
+	dev-libs/popt
+	sys-libs/readline:0=
+	gtk? ( >=x11-libs/gtk+extra-2 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-gui.patch )
+
+src_configure() {
+	econf \
+		$(use_enable gtk gui) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use doc && dodoc doc/gpsim.pdf
+
+	prune_libtool_files
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gpsim/, dev-embedded/gpsim/files/
@ 2017-09-05  7:22 Tim Harder
  0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2017-09-05  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     9ae24bf87ddd2c9f7076c59130bb22fa4888076a
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 07:21:39 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 07:22:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae24bf8

dev-embedded/gpsim: remove old

 dev-embedded/gpsim/Manifest                        |  2 -
 .../files/gpsim-0.26.1-glib-single-include.patch   | 13 ------
 .../gpsim/files/gpsim-0.26.1-gtkextra.patch        | 29 -------------
 dev-embedded/gpsim/gpsim-0.26.1.ebuild             | 48 ----------------------
 dev-embedded/gpsim/gpsim-0.27.0.ebuild             | 40 ------------------
 5 files changed, 132 deletions(-)

diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index a956c509100..4eab16323f7 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,4 +1,2 @@
-DIST gpsim-0.26.1.tar.gz 2350841 SHA256 509120f13971108f2f3e75706a354fb91cc777ad6b05244f26bded5e40a8b974 SHA512 ab710d57e5699e680674b97fb6c4eed19e45ee0bac05e40c2f8b4d58338b1023735e96aa7f9ce0c21048478d291a14fa41f216709b23d85d047d7c2b3e5e7d15 WHIRLPOOL 770f822c4547ef60e3dacc83b9d60db5bd7c0fb7819f3fc2e57b2841b4bbb53fd5f10da4d6da660c945be3497eee2f534c617b064c67a76d2c3f7c3d79524c66
-DIST gpsim-0.27.0.tar.gz 2465642 SHA256 204ed2a8aaf1b3021617544330997f4a508b811afce71fb9628b94406d5e59a2 SHA512 769a49d069cf24f0555ed6b34241139e69398fae1e01981298cd49a6096b8f196dfd9e6d8dfebf3f93294b3ca2acf9c4b1b21be600b5d0dd65dd99b6b159f06b WHIRLPOOL 2146a2cfa79a93b84d5caa014c7c639a4b9d97fbe179f18af697fadee7454aa4c4f379d4d0fe1e48c446bf411faffeef5aa6c4caeb268aa7c37c1f5b8953ba63
 DIST gpsim-0.29.0.tar.gz 3301050 SHA256 9ed078038da80dab117e803467d3df3818fa84af7a4a289aaac295913a30615d SHA512 f24997e7bc360afbc87f9cc1e36cf5fa25aecf23c21ba043eabb333b5de9ddfa24b1373fdaa48ba8043a7fcda72558d54691db2579345255dd453e94b3752920 WHIRLPOOL bc49858b811751cebdd54e5e5b2e5b3f29fd3ac8eabbebba659fed50fdd7e9b47f87d3279be3190522fea1fd45edff21c0d0078a9f51ab0228796a949b986085
 DIST gpsim-0.30.0.tar.gz 3385728 SHA256 e1927312c37119bc26d6abf2c250072a279a9c764c49ae9d71b4ccebb8154f86 SHA512 8681f06e73569b801d2961858c8676490d93f7ef40e99f07e7a5eff16955850b66bcd8182aa22ba0edca0b10723cb3a5b7b8bf52fdb0cc94955c3072352292df WHIRLPOOL 7341c7352edcfe3966c3422816a0e53226c3a2095e04c521ca21023a3ff52c934c69cca4c616ce38954e965c54c0dfeb57fea28d2e81effbf093062b212f5ed1

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
deleted file mode 100644
index cd0f798281b..00000000000
--- a/dev-embedded/gpsim/files/gpsim-0.26.1-glib-single-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 91329097051..00000000000
--- a/dev-embedded/gpsim/files/gpsim-0.26.1-gtkextra.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-=== 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
deleted file mode 100644
index 3d9b2371038..00000000000
--- a/dev-embedded/gpsim/gpsim-0.26.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
-HOMEPAGE="http://gpsim.sourceforge.net"
-SRC_URI="mirror://sourceforge/gpsim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc gtk static-libs"
-
-RDEPEND=">=dev-embedded/gputils-0.12
-	!dev-embedded/gpsim-lcd
-	dev-libs/glib:2
-	dev-libs/popt
-	sys-libs/readline
-	gtk? ( >=x11-libs/gtk+extra-2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-DOCS="ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-glib-single-include.patch \
-		"${FILESDIR}"/${P}-gtkextra.patch
-
-		eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk gui) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/gpsim.pdf
-
-	prune_libtool_files
-}

diff --git a/dev-embedded/gpsim/gpsim-0.27.0.ebuild b/dev-embedded/gpsim/gpsim-0.27.0.ebuild
deleted file mode 100644
index 5b10341ce33..00000000000
--- a/dev-embedded/gpsim/gpsim-0.27.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
-HOMEPAGE="http://gpsim.sourceforge.net"
-SRC_URI="mirror://sourceforge/gpsim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc gtk static-libs"
-
-RDEPEND=">=dev-embedded/gputils-0.12
-	!dev-embedded/gpsim-lcd
-	dev-libs/glib:2
-	dev-libs/popt
-	sys-libs/readline
-	gtk? ( >=x11-libs/gtk+extra-2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-DOCS="ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO"
-
-src_configure() {
-	econf \
-		$(use_enable gtk gui) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/gpsim.pdf
-
-	prune_libtool_files
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-09-05  7:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-25 21:35 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gpsim/, dev-embedded/gpsim/files/ Tim Harder
  -- strict thread matches above, loose matches on Subject: below --
2017-09-05  7:22 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox