From 36d81876388f040858b71a737f21c8e25b27b6e8 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 28 Jan 2007 02:20:09 +0000 Subject: [PATCH] Changed wxGTK dependency to 2.6 and made ebuild use wxwidgets eclass. Note that this package ignores WX_* variables and just compiles against the default wx flavour (ansi/unicode). This will need to be fixed after we get better wx-config management. Added patch for GCC 4.1. The build was actually failing but would not die for some reason, leaving half the package uncompiled and installing the rest (!). Added -fno-strict-aliasing CFLAG. Removed pythonhead from metadata. Package-Manager: portage-2.1.2-r4 --- app-misc/tipptrainer/ChangeLog | 15 +++++++- app-misc/tipptrainer/Manifest | 27 +++++++++----- .../files/digest-tipptrainer-0.6.0-r1 | 3 ++ ...iner-0.6.0-gcc41_extra_qualification.patch | 12 +++++++ app-misc/tipptrainer/metadata.xml | 9 +++-- .../tipptrainer/tipptrainer-0.6.0-r1.ebuild | 35 +++++++++++++++++++ 6 files changed, 87 insertions(+), 14 deletions(-) create mode 100644 app-misc/tipptrainer/files/digest-tipptrainer-0.6.0-r1 create mode 100644 app-misc/tipptrainer/files/tipptrainer-0.6.0-gcc41_extra_qualification.patch create mode 100644 app-misc/tipptrainer/tipptrainer-0.6.0-r1.ebuild diff --git a/app-misc/tipptrainer/ChangeLog b/app-misc/tipptrainer/ChangeLog index 2cf14ad54c38..5f33b66eb5a7 100644 --- a/app-misc/tipptrainer/ChangeLog +++ b/app-misc/tipptrainer/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for app-misc/tipptrainer # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/tipptrainer/ChangeLog,v 1.11 2007/01/19 14:19:56 masterdriverz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tipptrainer/ChangeLog,v 1.12 2007/01/28 02:20:09 dirtyepic Exp $ + +*tipptrainer-0.6.0-r1 (28 Jan 2007) + + 28 Jan 2007; Ryan Hill + +files/tipptrainer-0.6.0-gcc41_extra_qualification.patch, metadata.xml, + +tipptrainer-0.6.0-r1.ebuild: + Changed wxGTK dependency to 2.6 and made ebuild use wxwidgets eclass. Note + that this package ignores WX_* variables and just compiles against the + default wx flavour (ansi/unicode). This will need to be fixed after we get + better wx-config management. Added patch for GCC 4.1. The build was actually + failing but would not die for some reason, leaving half the package + uncompiled and installing the rest (!). Added -fno-strict-aliasing CFLAG. + Removed pythonhead from metadata. 19 Jan 2007; Charlie Shepherd tipptrainer-0.6.0.ebuild: diff --git a/app-misc/tipptrainer/Manifest b/app-misc/tipptrainer/Manifest index 26dc27387b42..d79ab59bacb7 100644 --- a/app-misc/tipptrainer/Manifest +++ b/app-misc/tipptrainer/Manifest @@ -1,16 +1,27 @@ +AUX tipptrainer-0.6.0-gcc41_extra_qualification.patch 462 RMD160 81ed95d5be5086412643ba2b9b94eaab81de488b SHA1 0717858b1286759126a5c7afd35700a2a947589b SHA256 980044ab6a59f5a7086d1b56daf22a02daf3a001bfc6cec3904be3689fec305c +MD5 c41b1176e2a57bb6070a0c8418011cbc files/tipptrainer-0.6.0-gcc41_extra_qualification.patch 462 +RMD160 81ed95d5be5086412643ba2b9b94eaab81de488b files/tipptrainer-0.6.0-gcc41_extra_qualification.patch 462 +SHA256 980044ab6a59f5a7086d1b56daf22a02daf3a001bfc6cec3904be3689fec305c files/tipptrainer-0.6.0-gcc41_extra_qualification.patch 462 DIST tipptrainer-0.6.0.tar.bz2 779950 RMD160 fa2b52d2caf38afea61691c2de6553d4bc665b2d SHA1 71a35bbc1064946f21dca04dfd6cb5345e900de6 SHA256 68e105cda8ce3891a2d33450d21e132e7806fc522d84b108c6d88c860c0403d1 +EBUILD tipptrainer-0.6.0-r1.ebuild 835 RMD160 b93102fd364b4b0f9bf28f52bc835c716e7b37e4 SHA1 4784a991ef3120b62288284a941b976612b6b75a SHA256 b35d911cc4af488528f7cea3f0fbe5093a2e35b4fc138e16a7f5c71235706c72 +MD5 a53dfffcee29feac15454e1c22938d65 tipptrainer-0.6.0-r1.ebuild 835 +RMD160 b93102fd364b4b0f9bf28f52bc835c716e7b37e4 tipptrainer-0.6.0-r1.ebuild 835 +SHA256 b35d911cc4af488528f7cea3f0fbe5093a2e35b4fc138e16a7f5c71235706c72 tipptrainer-0.6.0-r1.ebuild 835 EBUILD tipptrainer-0.6.0.ebuild 618 RMD160 2299f8165d97b70f180154d53f575dd536a12960 SHA1 816e9db2e37266aab8b2241b71c855c1980e863c SHA256 5b867989f692c5ecbdbb32aabd9a07d554ff9a978c4844d89707af5a98faafae MD5 021ea744f8e6450be7214eaa0ed2ec1d tipptrainer-0.6.0.ebuild 618 RMD160 2299f8165d97b70f180154d53f575dd536a12960 tipptrainer-0.6.0.ebuild 618 SHA256 5b867989f692c5ecbdbb32aabd9a07d554ff9a978c4844d89707af5a98faafae tipptrainer-0.6.0.ebuild 618 -MISC ChangeLog 1446 RMD160 477f43f2893b0537d1a182f83c796f6b7fcaf520 SHA1 42640d3316514332aed6f73d97e1be8066f8537f SHA256 dd1812e99fc49181c06a763a3e47f647f5a8b1440701025034924ab402e522d9 -MD5 eb7368fd39aabd7091491acbe8b419d9 ChangeLog 1446 -RMD160 477f43f2893b0537d1a182f83c796f6b7fcaf520 ChangeLog 1446 -SHA256 dd1812e99fc49181c06a763a3e47f647f5a8b1440701025034924ab402e522d9 ChangeLog 1446 -MISC metadata.xml 253 RMD160 2a00a9038ff001a4def40716d829ff2bf81d0218 SHA1 c330c9e15ffef6453e236f9c04b81e0fc11957ba SHA256 1dddf0b5aa8d3da551bb18eb70af9752af6ce0b8b6f7b73d2695cf57d343599d -MD5 c9b14dda87df95939826223f65fc2637 metadata.xml 253 -RMD160 2a00a9038ff001a4def40716d829ff2bf81d0218 metadata.xml 253 -SHA256 1dddf0b5aa8d3da551bb18eb70af9752af6ce0b8b6f7b73d2695cf57d343599d metadata.xml 253 +MISC ChangeLog 2122 RMD160 d231af91ae94c5a7a005d67880fdb5c4c58669c4 SHA1 03d1cda2e5096ddf158b7ec7f2af0519bca1a479 SHA256 81878841fa6df410635747973486f77d39a59a29c508e211a9e8bbe4ac9a119b +MD5 c5a1daf56c3e259ff86571f5504f2c21 ChangeLog 2122 +RMD160 d231af91ae94c5a7a005d67880fdb5c4c58669c4 ChangeLog 2122 +SHA256 81878841fa6df410635747973486f77d39a59a29c508e211a9e8bbe4ac9a119b ChangeLog 2122 +MISC metadata.xml 230 RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 SHA1 6c8fe85479c2fb5db137f9b9f85b56449bf21d79 SHA256 4bb9573931fffa78f631176d18a7aa5341ac7d832169f2ebc6df3d65f16b8e8b +MD5 2f58f2c24eeea3b0135c9dfffba7fe67 metadata.xml 230 +RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 metadata.xml 230 +SHA256 4bb9573931fffa78f631176d18a7aa5341ac7d832169f2ebc6df3d65f16b8e8b metadata.xml 230 MD5 04a7a114f9bd6a89e797c82dd82547e9 files/digest-tipptrainer-0.6.0 256 RMD160 7e5261253ab5a99a944ecace892d8dc63e1c4789 files/digest-tipptrainer-0.6.0 256 SHA256 7386f19e0c6ec5755f5c66d55a58ff9b3c4615c07cc206a7918c4b7230f7c8af files/digest-tipptrainer-0.6.0 256 +MD5 04a7a114f9bd6a89e797c82dd82547e9 files/digest-tipptrainer-0.6.0-r1 256 +RMD160 7e5261253ab5a99a944ecace892d8dc63e1c4789 files/digest-tipptrainer-0.6.0-r1 256 +SHA256 7386f19e0c6ec5755f5c66d55a58ff9b3c4615c07cc206a7918c4b7230f7c8af files/digest-tipptrainer-0.6.0-r1 256 diff --git a/app-misc/tipptrainer/files/digest-tipptrainer-0.6.0-r1 b/app-misc/tipptrainer/files/digest-tipptrainer-0.6.0-r1 new file mode 100644 index 000000000000..3c840f86374f --- /dev/null +++ b/app-misc/tipptrainer/files/digest-tipptrainer-0.6.0-r1 @@ -0,0 +1,3 @@ +MD5 eb4e5c6999673bc28e2ee2efb3826674 tipptrainer-0.6.0.tar.bz2 779950 +RMD160 fa2b52d2caf38afea61691c2de6553d4bc665b2d tipptrainer-0.6.0.tar.bz2 779950 +SHA256 68e105cda8ce3891a2d33450d21e132e7806fc522d84b108c6d88c860c0403d1 tipptrainer-0.6.0.tar.bz2 779950 diff --git a/app-misc/tipptrainer/files/tipptrainer-0.6.0-gcc41_extra_qualification.patch b/app-misc/tipptrainer/files/tipptrainer-0.6.0-gcc41_extra_qualification.patch new file mode 100644 index 000000000000..10e803cf777f --- /dev/null +++ b/app-misc/tipptrainer/files/tipptrainer-0.6.0-gcc41_extra_qualification.patch @@ -0,0 +1,12 @@ +diff -Naur tipptrainer-0.6.0-orig/src/lektion.h tipptrainer-0.6.0/src/lektion.h +--- tipptrainer-0.6.0-orig/src/lektion.h 2007-01-27 20:01:07.000000000 -0600 ++++ tipptrainer-0.6.0/src/lektion.h 2007-01-27 20:02:20.000000000 -0600 +@@ -42,7 +42,7 @@ + Lektion(UrlFile& lesson, LessonController* controller = 0, int id = wxID_ANY); + ~Lektion(); + +- void Lektion::Notify (); ++ void Notify (); + + //causes on constructor failure + class LessonLoadedFailed {}; diff --git a/app-misc/tipptrainer/metadata.xml b/app-misc/tipptrainer/metadata.xml index d90ae68b1c1c..aea9855d3885 100644 --- a/app-misc/tipptrainer/metadata.xml +++ b/app-misc/tipptrainer/metadata.xml @@ -1,9 +1,8 @@ -wxwindows - -pythonhead@gentoo.org -Rob Cakebread - + wxwindows + + wxwindows@gentoo.org + diff --git a/app-misc/tipptrainer/tipptrainer-0.6.0-r1.ebuild b/app-misc/tipptrainer/tipptrainer-0.6.0-r1.ebuild new file mode 100644 index 000000000000..f82d88fa0ddf --- /dev/null +++ b/app-misc/tipptrainer/tipptrainer-0.6.0-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/tipptrainer/tipptrainer-0.6.0-r1.ebuild,v 1.1 2007/01/28 02:20:09 dirtyepic Exp $ + +WX_GTK_VER="2.6" + +inherit flag-o-matic eutils wxwidgets + +DESCRIPTION="A touch typing trainer (German/English)" +HOMEPAGE="http://tipptrainer.pingos.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc" +IUSE="" +DEPEND=">=dev-libs/glib-1.2.7 + =x11-libs/wxGTK-2.6*" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc41_extra_qualification.patch +} + +src_compile() { + need-wxwidgets gtk2 + append-flags "-fno-strict-aliasing" + econf || die "econf failed" + emake || die "emake failed" +} + +src_install() { + einstall || die "einstall failed" +} -- 2.26.2