From a6c729922c7420d2a379348940dbc5e3466e5229 Mon Sep 17 00:00:00 2001 From: Joe Sapp Date: Fri, 9 Jan 2015 02:03:01 +0000 Subject: [PATCH] Version bump; fix install directory for .desktop and appdata files; fix license Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x84E08386 --- app-misc/klavaro/ChangeLog | 12 ++++- app-misc/klavaro/Manifest | 14 ++++-- .../klavaro/files/klavaro-3.0.1-datadir.patch | 27 ++++++++++++ .../files/klavaro-3.0.1-out-of-source.patch | 11 +++++ .../klavaro/files/klavaro-3.0.1-static.patch | 8 ++++ .../files/klavaro-desktop-keywords.patch | 11 +++++ app-misc/klavaro/klavaro-3.0.1.ebuild | 44 +++++++++++++++++++ 7 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 app-misc/klavaro/files/klavaro-3.0.1-datadir.patch create mode 100644 app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch create mode 100644 app-misc/klavaro/files/klavaro-3.0.1-static.patch create mode 100644 app-misc/klavaro/files/klavaro-desktop-keywords.patch create mode 100644 app-misc/klavaro/klavaro-3.0.1.ebuild diff --git a/app-misc/klavaro/ChangeLog b/app-misc/klavaro/ChangeLog index cc188739fabd..6f383265261c 100644 --- a/app-misc/klavaro/ChangeLog +++ b/app-misc/klavaro/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-misc/klavaro -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/ChangeLog,v 1.22 2014/09/26 19:10:05 axs Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/ChangeLog,v 1.23 2015/01/09 02:02:49 nixphoeni Exp $ + +*klavaro-3.0.1 (09 Jan 2015) + + 09 Jan 2015; Joe Sapp +klavaro-3.0.1.ebuild, + +files/klavaro-3.0.1-datadir.patch, +files/klavaro-3.0.1-out-of-source.patch, + +files/klavaro-3.0.1-static.patch, +files/klavaro-desktop-keywords.patch: + Version bump; fix install directory for .desktop and appdata files; fix + license 26 Sep 2014; Ian Stakenvicius (_AxS_) +files/klavaro-3.0.0-static.patch: diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest index cf1598f1739e..80cdb132ef80 100644 --- a/app-misc/klavaro/Manifest +++ b/app-misc/klavaro/Manifest @@ -4,16 +4,22 @@ Hash: SHA256 AUX klavaro-1.9.5-gold.patch 519 SHA256 d005b0c13f1bd595f947d6483b9c9cf69817a1d70b34cc73e964c4e4702961fb SHA512 47520489d0cfedeb4cd224d520609f004c87b49cd723a4d153771328dac6762010d7413db45345540970018bbaf3ecd91c1d5bb4174ba6efc43862b3030149a2 WHIRLPOOL cb365ede4771c887731bf0db1630a9ccd753b628fcbbb759c44106d69bec1d5fae7190fc9e7ef66ff12f261f77a93a1f185903e8c8a4b0467a65043d673329dc AUX klavaro-3.0.0-out-of-source.patch 434 SHA256 d4203e7a1ee699ff89efdf6fbd66025f1c14e5aee1ce2dbb16dc6d287d815d96 SHA512 ddb2cff0ed1aecaff058f6945ef2183a722452b8bfac00caf33a15112daf461c47ab3181f50a5c66fc3d496c9eaadee46a83b658efb5eb9050d6b5ae2a6abddc WHIRLPOOL f0bcaa9cd96f2953647636b9b1f234ff4bb9b9cb67c1cbad4759944621acc86821fa2ee7be28039f70c05f365997d0d3b22eb5e0a620a3776785d0423070f039 AUX klavaro-3.0.0-static.patch 447 SHA256 cf18d00a1c300620d3545f061428c4583907cbbf82f85f265ffc8081a10e1774 SHA512 239c08ac1af9cd79eb9ba0796d76b2f0c310a407d550c7dc6b27785918afef21f927bb5701266071cb5e9238624c6deda98348941276b6f258afb3c38e76dec4 WHIRLPOOL 8cb88f150594942816776bb53c575cf777b54bc9a49fa7e2014a09d57b76d9e292052a526d0baa317731eb4f0a1c5c1e95a569d98f2854210ecf88ab72523f74 +AUX klavaro-3.0.1-datadir.patch 996 SHA256 1c9f6e3033a20c55842c9e526369c2b60d70bcb328af1fe20cd098c9083cc0c6 SHA512 2f2547945af46df703a5e9276be0a55f899ab10341f370beb4fee1eb241c235e5ea99f8069e9c8989c4ff42e6b7130741bd8c5a0ed47ce63dbeae1fb3b9a0e8c WHIRLPOOL 97dc217ed81b7609629e52b359cb98da10c57d2a5b0f6241ed356781431244d0f989e14c97a28ac33099fa4bd79a619e53357f59cff70beefe533616aa127efd +AUX klavaro-3.0.1-out-of-source.patch 334 SHA256 ff82dbd83b8bd4d5cd4a08a8fdb40d27282df9297a83ca1d6980c7a120c4696e SHA512 d33e2a22e710a24016630b2f61b7804eb5ef49142148047c9d8b9a79a22ed788694c66cc01f68d0ce5be6b581e26fc5f4fe104b8fd68e7b0d9098c29c021b6ad WHIRLPOOL e40c214a211b6781d2a792cdf969744a5e794d9127b126ac3449be30fe475bb35214756422f6aa353d1bb64c5b26994124b351e43da33dd04686cc8a19040321 +AUX klavaro-3.0.1-static.patch 295 SHA256 982989787da3c0cd35a17f4e02dc0989be95e0df309fb49488dbbaa17376effb SHA512 9b7bbe2fe977df36afc7ebcb286b71e081c78ec1b72d611d78442250360fb8da2e8c424bcc327194268a39ab8ab1cce2a27be6a182bf7872284432e28a340863 WHIRLPOOL 1ac0e7478d51d7d4492eeb279ad0628cc7cf415ed9f5b71fcaa3f88249f4ea7dbedf9d9878ca84f67ce4e396ad5da05a035b902dcf8a80fa0661671b9664309f +AUX klavaro-desktop-keywords.patch 488 SHA256 67a9ea4996ef819202e9a8c8a8ee55410c765fdc4de24a4b237cfab243dd3b29 SHA512 34ee19f48c34ab5c79afc83eca15b24fe4ee85fee9105926cee9291815f2be0f9d991e740cacced1c27602c23121b03a630db3308f77aa7325c26fe07715f07b WHIRLPOOL 3906a57c187a1c5881ad80a34d00f98d014c3402d452f071b819a7b60e353dbca78719bead49f0cda294022050e6ef69bfec936bc75d773b4a08f8c283bd2fb5 DIST klavaro-1.9.7.tar.bz2 802138 SHA256 4ebe693639ae59e560e0bbc54077c804eae7c495f8a8436fb559cdbdf4e5c1c8 SHA512 1f27d2e1003e03644bc1ac765a56b9416314ce5a7088f8ece7e5abd450a3ac7c084caf7cdbdac4088edc5dedaf94540fc655781126050c1b14fe2939a78d503f WHIRLPOOL 9ef8d76ba8f4344313d3643a480f743c266dcff03e095b162143ce94aa212adb985cba8fa0330958a862adc22b4d9414b13df02f7652f90e56d8b480a54e3295 DIST klavaro-3.00.tar.bz2 1066189 SHA256 281a5360019b074f3eccff04cb6d63ac0612d7db459f519e9708b49e0364ef05 SHA512 7daa0169fb5f8e56914f626845706669d84a1574dedee43029d5abb408fdc98fbacd0be1d78dfb991ce0f71ccc3e401a89f07560fd68f065e543702b332de964 WHIRLPOOL a17059781fcb14fb21e6c65a5c045cdab3b502928983ed3090066320f412c5044cad76ec5a435f55fd1d0da7d3e7a9d9a7757d059b54c73f21a1462bcdd9df3a +DIST klavaro-3.01.tar.bz2 1140146 SHA256 ed71d522c29113d5d6517a65cbf95dafbe85ca4bb978139b804b98f128015e85 SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b WHIRLPOOL 7c45bf861cdca5ee40bf525377ab679bc8d02b6fc3c6559ccd376896c53246bca32a569721e77f4003c19488cbcc88c6ec48a17ee54b1fb0a959c3c76b69d977 EBUILD klavaro-1.9.7.ebuild 694 SHA256 a32e92c2326323764a8c55f2e8ee7e5530f58d069b9c5019b36ea41ff7c19a70 SHA512 07ab7b40a17f6281880b2797800e16508913c4a48901460b3ea784c2e00c8b6b1f97609b9ac6fecd98d41a7b09a38e3f08cd9710fd36ab1218332fe787c3491d WHIRLPOOL 44c33ebaa3bb125d70359b5fc3a023a8dd5c9d7e7d7a8f8990c44c7b95563dadecc361777f9dbf0359e8ba903b7adff022ffec3a532d30ce414952bd54aa3bb7 EBUILD klavaro-3.0.0.ebuild 899 SHA256 3dc8a556c6172f7f5e745473e6a9e6c8334ed8c0b19a5641a77ff1a19f5a70e1 SHA512 1d19c7d770df24b7539f346f3888023c13236ed9225725405d735ea73b4dda751b7e8ae48ccdccd892fef4fe6006eb9b0ab2beafe58f11f6476196fcc49dd811 WHIRLPOOL 0070f3ff598cfe3ea5bc4aeb954e824a4dafe143e9935f846db9ea12e96305d2b5043d552c9069a0d8ccd2d82a3d4ae203890e30aef0a8d59f22b5bcbb119ecd -MISC ChangeLog 3511 SHA256 2eb6dcff86655076c1cd93a8556f0cc3c1489f3ed60adb84190dda3b2934bb2a SHA512 7c09fe04186968faeb1c57c8c1fdd86880692a967e0096d0f48ed62826e7b16c07d95836d479080892c30162b490c3295c5461c228bf9c8c6016983bdc30ec48 WHIRLPOOL e37960ae07ba89a97059833224397ea422a34fed3dfd1594041feab019bd1d9e041fae0af9d4e0f2c01ac5267bf7d3a53d0e5f99d1bb0f685135b544da317643 +EBUILD klavaro-3.0.1.ebuild 976 SHA256 77ecc668dde346d6d6553a02e806c7839a89f35d9896b0e47384f239ebb0a2ad SHA512 925152f7314531c528048b8b032237e8efb9afdab0fb5b31d8262d063f79216eb732688f07f6c4a6367784b6230a6857f9cf0423406cc271c37d1c5a4fb10e10 WHIRLPOOL 7e90ce62abea375d3ce216a3fb01dc00c59f70c15534909e0d5dc8048d622a44854328825b731e98b2756390afce4f8920b85785e409b4e14005901f56e58737 +MISC ChangeLog 3858 SHA256 2dc2fabae84e38adc0394008637e4f7617928b8c493fe8b47c8dcf2c2c9cf292 SHA512 035342fd543a6d3bddadfc326b12d83f18d599ffc4761d65e898446b49619aa5d33584f698925e3bed2285303615c949ae41519553f3a65b9ee7e2e4569cfbc1 WHIRLPOOL f42a54094afc950f960562b652392982302177d6ebc9ad90c5058f8c7bc15c687fae9bd09251ec530d46caf3490d30fa55c0e1abdd6870c41e3a8214607d6ee8 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlQluhsACgkQ2ugaI38ACPB78QD+N1D5U94rCGwG6tIvvvAKYbqI -OMR3DTXNNa4WHAAhHggA/3zAy8Dxaubzka/8Jg4aEE9nnPZjV7p/bJOwNoMlzx3M -=vLTP +iF4EAREIAAYFAlSvNtEACgkQuD9/QYTgg4Z12wD/QnLk8nfMXcesP9GMELRJMZ+8 +753GKUU8l3FVeyW/lEMA/ig2rmlIL1mrdKiVpflGbGy20vG3ioX+TGZ9+BOz3sdZ +=1TYt -----END PGP SIGNATURE----- diff --git a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch new file mode 100644 index 000000000000..21047a197ccb --- /dev/null +++ b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch @@ -0,0 +1,27 @@ +--- data/Makefile.am 2014-12-18 23:16:47.513887559 -0500 ++++ data/Makefile.am 2014-12-18 23:16:59.060609420 -0500 +@@ -151,11 +151,11 @@ + EXTRA_DIST = $(klavaro_data) + else + @INTLTOOL_DESKTOP_RULE@ +-desktopdir = $(prefix)/$(DATADIRNAME)/applications ++desktopdir = $(datadir)/applications + desktop_in_file = klavaro.desktop.in + desktop_DATA = $(desktop_in_file:.desktop.in=.desktop) + @INTLTOOL_XML_RULE@ +-appdatadir = $(prefix)/$(DATADIRNAME)/appdata ++appdatadir = $(datadir)/appdata + appdata_in_files = klavaro.appdata.xml.in + appdata_DATA = $(appdata_in_files:.xml.in=.xml) + DISTCLEANFILES = $(desktop_DATA) \ +--- src/Makefile.am 2014-12-18 23:17:35.956725053 -0500 ++++ src/Makefile.am 2014-12-18 23:17:45.309501898 -0500 +@@ -20,7 +20,7 @@ + + AM_CPPFLAGS = @GTK_CFLAGS@ \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ +- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" ++ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" + + AM_CFLAGS = -Wextra \ + -I$(top_srcdir)/gtkdatabox diff --git a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch new file mode 100644 index 000000000000..5e4a9d48fbd1 --- /dev/null +++ b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch @@ -0,0 +1,11 @@ +--- src/Makefile.am 2014-09-05 10:26:56.000000000 -0400 ++++ src/Makefile.am 2014-12-18 21:27:55.443335860 -0500 +@@ -29,7 +29,7 @@ + + klavaro_LDADD = @GTK_LIBS@ \ + -lgmodule-2.0 \ +- $(top_srcdir)/gtkdatabox/libgtkdataboks.la ++ $(top_builddir)/gtkdatabox/libgtkdataboks.la + + if IS_POSIX + AM_CFLAGS += -export-dynamic diff --git a/app-misc/klavaro/files/klavaro-3.0.1-static.patch b/app-misc/klavaro/files/klavaro-3.0.1-static.patch new file mode 100644 index 000000000000..010cd11de005 --- /dev/null +++ b/app-misc/klavaro/files/klavaro-3.0.1-static.patch @@ -0,0 +1,8 @@ +--- gtkdatabox/Makefile.am 2014-12-18 21:26:18.129806730 -0500 ++++ gtkdatabox/Makefile.am 2014-12-18 21:26:30.528364491 -0500 +@@ -1,4 +1,4 @@ +-lib_LTLIBRARIES = libgtkdataboks.la ++noinst_LTLIBRARIES = libgtkdataboks.la + libgtkdataboks_la_SOURCES= \ + gtkdatabox.c\ + gtkdatabox_marshal.c\ diff --git a/app-misc/klavaro/files/klavaro-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-desktop-keywords.patch new file mode 100644 index 000000000000..fbf39ab954be --- /dev/null +++ b/app-misc/klavaro/files/klavaro-desktop-keywords.patch @@ -0,0 +1,11 @@ +--- data/klavaro.desktop.in 2015-01-07 21:52:37.877646655 -0500 ++++ data/klavaro.desktop.in 2015-01-07 21:52:56.391720366 -0500 +@@ -2,7 +2,7 @@ + Name=Klavaro + _Comment=A very flexible and efficient touch typing tutor. + # Translators: these are keywords related to the program. CAI above means Computer Aided Instruction. Feel free to add and/or change the keywords in your language. +-_Keywords=keyboard;typing;tutor;CAI ++_Keywords=keyboard;typing;tutor;CAI; + + Exec=klavaro + Icon=klavaro diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1.ebuild new file mode 100644 index 000000000000..b9c4212647e2 --- /dev/null +++ b/app-misc/klavaro/klavaro-3.0.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-3.0.1.ebuild,v 1.1 2015/01/09 02:02:49 nixphoeni Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes + +inherit autotools-utils versionator + +MY_P="${PN}-$(delete_version_separator 2)" + +DESCRIPTION="Another free touch typing tutor program" +HOMEPAGE="http://klavaro.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+static-libs" + +RDEPEND=" + net-misc/curl + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/pango +" +# gtk+3 version needed +# x11-libs/gtkdatabox + +DEPEND="${RDEPEND} + dev-util/intltool + >=sys-devel/gettext-0.18.3 + dev-util/gtk-builder-convert + " + +PATCHES=( + "${FILESDIR}"/${P}-out-of-source.patch + "${FILESDIR}"/${P}-static.patch + "${FILESDIR}"/${P}-datadir.patch + "${FILESDIR}"/${PN}-desktop-keywords.patch + ) + +S="${WORKDIR}"/${MY_P} -- 2.26.2