From 00e0255a99044c9ffc16f5f85774ea75a9b170f7 Mon Sep 17 00:00:00 2001 From: Denis Dupeyron Date: Fri, 9 Mar 2007 22:34:48 +0000 Subject: [PATCH] Cleanups and gcc 4.1 compatibility fixes. Package-Manager: portage-2.1.2.2 --- sci-electronics/vbs/ChangeLog | 7 +- sci-electronics/vbs/Manifest | 24 ++-- .../vbs/files/vbs-1.4.0-gcc-4.1.patch | 111 ++++++++++++++++++ sci-electronics/vbs/files/vbs-gcc-3.4.patch | 44 ------- sci-electronics/vbs/vbs-1.4.0.ebuild | 26 ++-- 5 files changed, 141 insertions(+), 71 deletions(-) create mode 100644 sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch delete mode 100644 sci-electronics/vbs/files/vbs-gcc-3.4.patch diff --git a/sci-electronics/vbs/ChangeLog b/sci-electronics/vbs/ChangeLog index bcac819275fd..4c34adc77f4d 100644 --- a/sci-electronics/vbs/ChangeLog +++ b/sci-electronics/vbs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-electronics/vbs # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/vbs/ChangeLog,v 1.5 2007/02/21 18:57:34 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/vbs/ChangeLog,v 1.6 2007/03/09 22:34:48 calchan Exp $ + + 09 Mar 2007; Denis Dupeyron + +files/vbs-1.4.0-gcc-4.1.patch, -files/vbs-gcc-3.4.patch, + vbs-1.4.0.ebuild: + Cleanups and gcc 4.1 compatibility fixes. 21 Feb 2007; Denis Dupeyron files/digest-vbs-1.4.0, Manifest: diff --git a/sci-electronics/vbs/Manifest b/sci-electronics/vbs/Manifest index 12ff733b5c35..7216ffb8829e 100644 --- a/sci-electronics/vbs/Manifest +++ b/sci-electronics/vbs/Manifest @@ -1,16 +1,16 @@ -AUX vbs-gcc-3.4.patch 1658 RMD160 60847328f4d79de90a8603100a8b444ebf470e46 SHA1 447d61c1d0d4e60f8b18b27e3a2adeea51d925d4 SHA256 1278ae3eb008ab1fe7ebd9fd767549d4676328d72c2de152125a7a79a1754227 -MD5 0afd4a3b8f7839b7a339d2a1f1353bc4 files/vbs-gcc-3.4.patch 1658 -RMD160 60847328f4d79de90a8603100a8b444ebf470e46 files/vbs-gcc-3.4.patch 1658 -SHA256 1278ae3eb008ab1fe7ebd9fd767549d4676328d72c2de152125a7a79a1754227 files/vbs-gcc-3.4.patch 1658 +AUX vbs-1.4.0-gcc-4.1.patch 3640 RMD160 d92bf7c964acf89d12aef2cd7412a4c2fe6dbbcc SHA1 b854dbb9eb3ff4d2a8fa2a43e4032427c375c9b9 SHA256 dabd6f97a2b70830a75e6dad7231d3f01546929742aa9a3fbc0a113617bf6642 +MD5 986b6f438eeb295c28a41b7f1ef36308 files/vbs-1.4.0-gcc-4.1.patch 3640 +RMD160 d92bf7c964acf89d12aef2cd7412a4c2fe6dbbcc files/vbs-1.4.0-gcc-4.1.patch 3640 +SHA256 dabd6f97a2b70830a75e6dad7231d3f01546929742aa9a3fbc0a113617bf6642 files/vbs-1.4.0-gcc-4.1.patch 3640 DIST vbs-1.4.0.tar.gz 275974 RMD160 a008225ab72b92f922b2f769bd13beca0b82530c SHA1 fd39003417230d8d4cb12b8ff1e005006b6c8946 SHA256 c29e6d2bb89ef9e08f8b94eadd06801c79bae7fcb401748d8a2ef28d742e80b4 -EBUILD vbs-1.4.0.ebuild 862 RMD160 f7c8993d227dd034d60cb175cd5b52f85c1d8c8e SHA1 1226aafb69ac50fb502b9bf4b0b30fc861d10dcc SHA256 94dd9633d127fe9a6ccbc2d7e9a7c0dc7ec4906ee74050666ececd328af905ec -MD5 d2fc9be13f4c20590cb7a769d99239b6 vbs-1.4.0.ebuild 862 -RMD160 f7c8993d227dd034d60cb175cd5b52f85c1d8c8e vbs-1.4.0.ebuild 862 -SHA256 94dd9633d127fe9a6ccbc2d7e9a7c0dc7ec4906ee74050666ececd328af905ec vbs-1.4.0.ebuild 862 -MISC ChangeLog 1107 RMD160 105434663d2e17affd9af08d419132aa2a98f905 SHA1 a3626878655b35a9bb5d7c506f98bf1ed2288bf2 SHA256 a3e4e2bc1398972f598a29f300eec88a9b633880cb5e2e9b7a7d446461a4c8d6 -MD5 10bd4be682962186845242feb27403b3 ChangeLog 1107 -RMD160 105434663d2e17affd9af08d419132aa2a98f905 ChangeLog 1107 -SHA256 a3e4e2bc1398972f598a29f300eec88a9b633880cb5e2e9b7a7d446461a4c8d6 ChangeLog 1107 +EBUILD vbs-1.4.0.ebuild 955 RMD160 cd859511daf32f113a9932f00651a2c644ed78f0 SHA1 e0c9691328eec698d2580af2c943aeb621673626 SHA256 3900e1a6ee9990f80223431e06e9717852ecd125218b5f1e1fcf7e654d1058ad +MD5 7cfa788f556e49824d5b0b916f4276f6 vbs-1.4.0.ebuild 955 +RMD160 cd859511daf32f113a9932f00651a2c644ed78f0 vbs-1.4.0.ebuild 955 +SHA256 3900e1a6ee9990f80223431e06e9717852ecd125218b5f1e1fcf7e654d1058ad vbs-1.4.0.ebuild 955 +MISC ChangeLog 1283 RMD160 e562368df8cf45154dfa8ab53d413d4490516cf6 SHA1 1b25b08ed3d7b8d866c31bd2b7aace713f520843 SHA256 851dc9909e6f493d29703b02885a7d06ec759c8a1a6fbdbcab0103c5381984e6 +MD5 74b34627a8eb92148bde5c5e2c6bb7e3 ChangeLog 1283 +RMD160 e562368df8cf45154dfa8ab53d413d4490516cf6 ChangeLog 1283 +SHA256 851dc9909e6f493d29703b02885a7d06ec759c8a1a6fbdbcab0103c5381984e6 ChangeLog 1283 MISC metadata.xml 422 RMD160 bcff472ce8e94f4dd18838809848710f12339f17 SHA1 a060f1e01f6483612ec118012ab393493e6c3489 SHA256 3c9eb974473a4808c8b81c30dba0dc5daf07efd157d5d56a5a236008eece4990 MD5 3640fdc8f103f6fd0d810a6269cbea00 metadata.xml 422 RMD160 bcff472ce8e94f4dd18838809848710f12339f17 metadata.xml 422 diff --git a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch new file mode 100644 index 000000000000..20f2aadb7e6e --- /dev/null +++ b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch @@ -0,0 +1,111 @@ +diff -ur vbs-1.4.0.orig/src/common/bvector.h vbs-1.4.0/src/common/bvector.h +--- vbs-1.4.0.orig/src/common/bvector.h 2003-01-12 05:40:59.000000000 +0100 ++++ vbs-1.4.0/src/common/bvector.h 2007-03-09 22:40:02.000000000 +0100 +@@ -90,9 +90,9 @@ + size_type _size; // Size of this sub-bit vector. + + // Only bit_vector can create a sub_bit_vector object. ++ public: + sub_bit_vector(bit_vector &, const position_type, const position_type); + sub_bit_vector(const sub_bit_vector &); +- public: + sub_bit_vector &operator=(const sub_bit_vector &); + sub_bit_vector &operator=(const const_sub_bit_vector &); + sub_bit_vector &operator=(const bit_vector &); +@@ -116,8 +116,8 @@ + + // Only bit_vector can create a sub_bit_vector object. + const_sub_bit_vector(const bit_vector &, const position_type, const position_type); +- const_sub_bit_vector(const const_sub_bit_vector &); + public: ++ const_sub_bit_vector(const const_sub_bit_vector &); + size_type size() const + { return _size; } + ostream_type &info(ostream_type &) const; +diff -ur vbs-1.4.0.orig/src/common/logic.h vbs-1.4.0/src/common/logic.h +--- vbs-1.4.0.orig/src/common/logic.h 2002-10-21 11:01:02.000000000 +0200 ++++ vbs-1.4.0/src/common/logic.h 2007-03-09 22:40:02.000000000 +0100 +@@ -44,6 +44,10 @@ + { return (_state == HI) ? true : false; } + operator int() const + { return _state; } ++ ++ operator long int() const ++ { return _state; } ++ + operator char() const + { + switch (_state) +diff -ur vbs-1.4.0.orig/src/common/st_net.h vbs-1.4.0/src/common/st_net.h +--- vbs-1.4.0.orig/src/common/st_net.h 2002-11-24 03:07:00.000000000 +0100 ++++ vbs-1.4.0/src/common/st_net.h 2007-03-09 22:40:02.000000000 +0100 +@@ -133,4 +133,7 @@ + const st_net &_net; + }; + ++void entry_iovars(st_net::io_list &, st_net::arg_list &); ++void exit_iovars(st_net::io_list &, st_net::arg_list &); ++ + #endif // _ST_NET_H +diff -ur vbs-1.4.0.orig/src/expr/erdwr.cc vbs-1.4.0/src/expr/erdwr.cc +--- vbs-1.4.0.orig/src/expr/erdwr.cc 2002-05-28 08:22:46.000000000 +0200 ++++ vbs-1.4.0/src/expr/erdwr.cc 2007-03-09 22:40:02.000000000 +0100 +@@ -25,8 +25,9 @@ + expr_base * + read_expr::operator()() const + { +- VBSOBJ_EXPR_TYPE type; +- _in >> (int &) type; ++ int type_num = 0; ++ _in >> type_num; ++ VBSOBJ_EXPR_TYPE type = VBSOBJ_EXPR_TYPE(type_num); + long ln; + _in >> ln; + expr_base *expr = 0; +diff -ur vbs-1.4.0.orig/src/Makefile.in vbs-1.4.0/src/Makefile.in +--- vbs-1.4.0.orig/src/Makefile.in 2003-06-08 00:38:24.000000000 +0200 ++++ vbs-1.4.0/src/Makefile.in 2007-03-09 22:40:02.000000000 +0100 +@@ -329,13 +329,15 @@ + rm -f *.o + rm -f *.a + rm -f *.so ++ rm -f vbs + + clean-repo: + if test -d ptrepository; then rm -rf ptrepository; fi + rm -f *.rpo + + install: +- $(INSTALL) vbs $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL) vbs $(DESTDIR)$(bindir) + + tarball: + @echo "===== Tar ball ======" +diff -ur vbs-1.4.0.orig/src/misc/mrdwr.cc vbs-1.4.0/src/misc/mrdwr.cc +--- vbs-1.4.0.orig/src/misc/mrdwr.cc 2002-05-28 11:42:00.000000000 +0200 ++++ vbs-1.4.0/src/misc/mrdwr.cc 2007-03-09 22:40:02.000000000 +0100 +@@ -21,8 +21,9 @@ + module * + read_module::operator()() const + { +- VBSOBJ_MISC_TYPE type; +- _in >> (int &) type; ++ int type_num = 0; ++ _in >> type_num; ++ VBSOBJ_MISC_TYPE type = VBSOBJ_MISC_TYPE(type_num); + if (type != VBSOBJ_MISC_MODULE) + { + vbs_err.set_data(vbs_error::SE_VBSOBJ, -1); +@@ -129,8 +130,9 @@ + port * + read_port::operator()() const + { +- VBSOBJ_MISC_TYPE type; +- _in >> (int &) type; ++ int type_num = 0; ++ _in >> type_num; ++ VBSOBJ_MISC_TYPE type = VBSOBJ_MISC_TYPE(type_num); + if (type != VBSOBJ_MISC_PORT) + { + vbs_err.set_data(vbs_error::SE_VBSOBJ, -1); diff --git a/sci-electronics/vbs/files/vbs-gcc-3.4.patch b/sci-electronics/vbs/files/vbs-gcc-3.4.patch deleted file mode 100644 index 9ee5b1af06fd..000000000000 --- a/sci-electronics/vbs/files/vbs-gcc-3.4.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- src/common/bvector.h 2003-01-12 04:40:59.000000000 +0000 -+++ src/common/bvector.h 2004-10-03 18:19:38.364060736 +0100 -@@ -88,10 +88,6 @@ - position_type _begin; // Starting position. - position_type _end; // Stopping position. - size_type _size; // Size of this sub-bit vector. -- -- // Only bit_vector can create a sub_bit_vector object. -- sub_bit_vector(bit_vector &, const position_type, const position_type); -- sub_bit_vector(const sub_bit_vector &); - public: - sub_bit_vector &operator=(const sub_bit_vector &); - sub_bit_vector &operator=(const const_sub_bit_vector &); -@@ -100,6 +96,10 @@ - { return _size; } - ostream_type &info(ostream_type &) const; - -+ // Only bit_vector can create a sub_bit_vector object. -+ sub_bit_vector(bit_vector &, const position_type, const position_type); -+ sub_bit_vector(const sub_bit_vector &); -+ - // We don't need any other method, yet! - }; - class const_sub_bit_vector -@@ -113,15 +113,15 @@ - position_type _begin; // Starting position. - position_type _end; // Stopping position. - size_type _size; // Size of this sub-bit vector. -- -- // Only bit_vector can create a sub_bit_vector object. -- const_sub_bit_vector(const bit_vector &, const position_type, const position_type); -- const_sub_bit_vector(const const_sub_bit_vector &); - public: - size_type size() const - { return _size; } - ostream_type &info(ostream_type &) const; - -+ // Only bit_vector can create a sub_bit_vector object. -+ const_sub_bit_vector(const bit_vector &, const position_type, const position_type); -+ const_sub_bit_vector(const const_sub_bit_vector &); -+ - // We don't need any other method, yet! - }; - diff --git a/sci-electronics/vbs/vbs-1.4.0.ebuild b/sci-electronics/vbs/vbs-1.4.0.ebuild index f51635073266..d7cf0e3a5a9a 100644 --- a/sci-electronics/vbs/vbs-1.4.0.ebuild +++ b/sci-electronics/vbs/vbs-1.4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation and Tim Yamin +# Copyright 1999-2007 Gentoo Foundation and Tim Yamin # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/vbs/vbs-1.4.0.ebuild,v 1.2 2005/05/17 18:18:50 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/vbs/vbs-1.4.0.ebuild,v 1.3 2007/03/09 22:34:48 calchan Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -IUSE="" +IUSE="examples" KEYWORDS="ppc ~x86" DEPEND=">=sys-devel/flex-2.3 @@ -18,23 +18,21 @@ DEPEND=">=sys-devel/flex-2.3 src_unpack () { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-gcc-3.4.patch + epatch ${FILESDIR}/${P}-gcc-4.1.patch } src_compile () { cd src - econf || die - emake vbs || die + econf || die "Configuration failed" + emake -j1 vbs || die "Compilation failed" } src_install () { - dodoc BUGS CONTRIBUTORS COPYRIGHT FAQ README vbs.txt - - docinto examples - dodoc EXAMPLES/* - - exeinto /usr/bin - doexe src/vbs + dodoc BUGS CHANGELOG* CONTRIBUTORS COPYRIGHT FAQ README vbs.txt + dobin src/vbs + if use examples ; then + insinto /usr/share/${PF}/examples + doins EXAMPLES/* + fi } -- 2.26.2