USE=truetype check for libg15render by tove wrt bug #170417, drop of 3.0.2

Package-Manager: portage-2.1.2.2

diff --git a/app-misc/g15composer/ChangeLog b/app-misc/g15composer/ChangeLog
index 6400f34004dcd1ee427220f5690f359eb3896ea7..de05f2bb2965c1d8eab41e7c7697cec9a275fefb 100644 (file)
--- a/app-misc/g15composer/ChangeLog
+++ b/app-misc/g15composer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/g15composer
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.13 2007/03/15 08:48:05 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.14 2007/03/15 10:44:39 rbu Exp $
+
+  15 Mar 2007; Robert Buchholz <rbu@gentoo.org>
+  -files/g15composer-3.0.2.confd, -files/g15composer-3.0.2.initd,
+  g15composer-1.1.ebuild, -g15composer-3.0.2.ebuild, g15composer-3.1.ebuild:
+  USE=truetype check for libg15render by tove wrt bug #170417, drop of 3.0.2
+  version
 
   15 Mar 2007; Torsten Veller <tove@gentoo.org> g15composer-3.1.ebuild:
   Stable on x86 (#170417)

diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
index bbbce80180c563608288c7c8986f5316793a2803..ef71d01bf90639557512bcac0d8db66b063dd078 100644 (file)
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -5,14 +5,6 @@ AUX g15composer-1.1.initd 737 RMD160 57b7f6135ab48dd587e793e74ce36de4d147be95 SH
 MD5 27352b82a03e114a05813dfb4401fc02 files/g15composer-1.1.initd 737
 RMD160 57b7f6135ab48dd587e793e74ce36de4d147be95 files/g15composer-1.1.initd 737
 SHA256 fe12bcbe0d2a5a8cf7cab7e01bf50f73d37a03571b6b89b955106e5ff5591c69 files/g15composer-1.1.initd 737
-AUX g15composer-3.0.2.confd 334 RMD160 201d38323e1425e2a42c9033d42ed7f93b5164d5 SHA1 a1a1c902681cc1ff24ee81598b824ce1b4af19db SHA256 88ce03f1427db99b2fbafcda352a1597a068491ae79b65af58815294c593ec76
-MD5 76c8067d89a245c98df65477eb1d7c13 files/g15composer-3.0.2.confd 334
-RMD160 201d38323e1425e2a42c9033d42ed7f93b5164d5 files/g15composer-3.0.2.confd 334
-SHA256 88ce03f1427db99b2fbafcda352a1597a068491ae79b65af58815294c593ec76 files/g15composer-3.0.2.confd 334
-AUX g15composer-3.0.2.initd 688 RMD160 8fa2b143d7cba164b28ece99f944b4b4dcf8eeb0 SHA1 0cf2aec633ff4da13ce614757f559c3b064099df SHA256 63831edc1a1e689c5a151b36adf72a8586e848654d4944f13291d901e913a76f
-MD5 eb6a736e0b1b969bc8af373bd45dd316 files/g15composer-3.0.2.initd 688
-RMD160 8fa2b143d7cba164b28ece99f944b4b4dcf8eeb0 files/g15composer-3.0.2.initd 688
-SHA256 63831edc1a1e689c5a151b36adf72a8586e848654d4944f13291d901e913a76f files/g15composer-3.0.2.initd 688
 AUX g15composer-3.1.confd 695 RMD160 179650946e535b994d35c3913a7087d7f2154e68 SHA1 4f2ebfcae2649786876e0744ec3e6ecc0dd57281 SHA256 1f070d07b3a4956b7dfe584bdb25043d340314e8916cb2e00afa9060cf5488e6
 MD5 3c31e6ced6ab1141f3db01ccee7e691c files/g15composer-3.1.confd 695
 RMD160 179650946e535b994d35c3913a7087d7f2154e68 files/g15composer-3.1.confd 695
@@ -22,24 +14,19 @@ MD5 0ae86a2029ee93c051c71015f34685f9 files/g15composer-3.1.initd 1368
 RMD160 3d478ac01259bec0f4c3d6ddb6ee97a22fd9518f files/g15composer-3.1.initd 1368
 SHA256 ac3ff78050b36ae62d67b27f760f712676a8394aaeb556510eaa8ebc29a46f19 files/g15composer-3.1.initd 1368
 DIST g15composer-1.1.tar.bz2 70140 RMD160 51d431adfc4469f8195c077d49e82b98bea04b57 SHA1 6b30f1c521fb1c45f7ce628fc812a09feb6e827a SHA256 52220b0e3e1219ecf5504f8b70d7be23a4e12d640b9367e34a3db6bbfe2dc2ef
-DIST g15composer-3.0.2.tar.bz2 101556 RMD160 df548cbcffffa5f5e316b852a5f166ae48ab8fd4 SHA1 be3591adb388d47473dd8bea0a7ea191cfb355ca SHA256 615e2991a2de9b656be2550e90ac874c26dba650f4af1fd21feb3f0bda3150c0
 DIST g15composer-3.1.tar.bz2 104109 RMD160 ab31de24416452a8a363e0a0ae8856c21706b6fc SHA1 648117dde17d356878dd834de763004d6b6d8f0a SHA256 d8f34c1711e95f8ca3ddd9fd5f557a51bb23b79099fbf2fddb96bdcd03067988
-EBUILD g15composer-1.1.ebuild 952 RMD160 907b0dd14418cf5bda68bd6bc5189703051ba454 SHA1 ada6b559e8d2d456fd8df38fec6eedb3ab4077f5 SHA256 1225133775eb4927088b56d4687310cab649c517c2eefe904a773dc11f7f3461
-MD5 bfa4772e46e9425006bc5819d17b0c3d g15composer-1.1.ebuild 952
-RMD160 907b0dd14418cf5bda68bd6bc5189703051ba454 g15composer-1.1.ebuild 952
-SHA256 1225133775eb4927088b56d4687310cab649c517c2eefe904a773dc11f7f3461 g15composer-1.1.ebuild 952
-EBUILD g15composer-3.0.2.ebuild 1566 RMD160 457cb074d13ecb162379460039fbeb46f626eef9 SHA1 46c5417b7facb432f3f50318717126f8073b6486 SHA256 bf517f5b4cc29a328ba647d83e005855bfac593b80db6697ba64e9a724b61045
-MD5 2e29c7245463b047a208d94b310a88e9 g15composer-3.0.2.ebuild 1566
-RMD160 457cb074d13ecb162379460039fbeb46f626eef9 g15composer-3.0.2.ebuild 1566
-SHA256 bf517f5b4cc29a328ba647d83e005855bfac593b80db6697ba64e9a724b61045 g15composer-3.0.2.ebuild 1566
-EBUILD g15composer-3.1.ebuild 1707 RMD160 2eda7369a35cccfa28f0f5dafb95fe94276536c2 SHA1 50c20cffece44910b3d7a9276cc7e5f826976e8e SHA256 daf8de2596a53aca1a8904a68e7a910e0af038b93a514e1be6107c266be6b871
-MD5 4741712fd5016ed35adf6a6eaa517efa g15composer-3.1.ebuild 1707
-RMD160 2eda7369a35cccfa28f0f5dafb95fe94276536c2 g15composer-3.1.ebuild 1707
-SHA256 daf8de2596a53aca1a8904a68e7a910e0af038b93a514e1be6107c266be6b871 g15composer-3.1.ebuild 1707
-MISC ChangeLog 2477 RMD160 c76da81e4c7880f1729ef6c7eb733f097b96b7b8 SHA1 80a4569163cdf4673db2600447cef73faa7d525d SHA256 6652678d332319eca7483f1190f2b5587b315bf841e217e1256653ecc308a5f0
-MD5 eb14587bea265db15d59de69198db6ab ChangeLog 2477
-RMD160 c76da81e4c7880f1729ef6c7eb733f097b96b7b8 ChangeLog 2477
-SHA256 6652678d332319eca7483f1190f2b5587b315bf841e217e1256653ecc308a5f0 ChangeLog 2477
+EBUILD g15composer-1.1.ebuild 1200 RMD160 3d8934a597ec8322728dbadbcf24182d768c78aa SHA1 c1cfd80b7da0894d8aacac64753aa4e03fa39ae8 SHA256 875846b60e0d3b8545a496ce6a328f0f2d7cf6bf935f1fb4bc559e337096214f
+MD5 0078ea376a4f502988e7c8f9997f84f3 g15composer-1.1.ebuild 1200
+RMD160 3d8934a597ec8322728dbadbcf24182d768c78aa g15composer-1.1.ebuild 1200
+SHA256 875846b60e0d3b8545a496ce6a328f0f2d7cf6bf935f1fb4bc559e337096214f g15composer-1.1.ebuild 1200
+EBUILD g15composer-3.1.ebuild 2007 RMD160 aa29fd2d806076ecaa3657310621f0b1cedf9460 SHA1 699df6d18bf4e738b968ca9421203fdfbc6ca100 SHA256 cf43019f1c769034c6629d8a0c94d432b30275fadfdad4703730f46f4bb2b12a
+MD5 4554f99370bcbb0b1cce7ddd62bc47f7 g15composer-3.1.ebuild 2007
+RMD160 aa29fd2d806076ecaa3657310621f0b1cedf9460 g15composer-3.1.ebuild 2007
+SHA256 cf43019f1c769034c6629d8a0c94d432b30275fadfdad4703730f46f4bb2b12a g15composer-3.1.ebuild 2007
+MISC ChangeLog 2755 RMD160 ff7f593421de9f41485fa4c55deda94b38ea068a SHA1 59425e1795c85fe92df32e2e2f65ba3bf9efbc49 SHA256 025a76e28e9a90ea8a36a3441f9ca73bf48517a8240b6e0e96d4795bd74f2665
+MD5 62a32c1ec5f80f41fc8d5d9d5488b436 ChangeLog 2755
+RMD160 ff7f593421de9f41485fa4c55deda94b38ea068a ChangeLog 2755
+SHA256 025a76e28e9a90ea8a36a3441f9ca73bf48517a8240b6e0e96d4795bd74f2665 ChangeLog 2755
 MISC metadata.xml 249 RMD160 f108edee61c95c42d98726b435b75d03cbbd4aac SHA1 48461481dfc5a9d1f5b4726a5e9882a2fb966ede SHA256 1dc990d64e5b42c9b17d7358c9f0af7d26702f575957482d93c8fd12a556cc11
 MD5 5c2a70625109d5bd093ae8d0588931f1 metadata.xml 249
 RMD160 f108edee61c95c42d98726b435b75d03cbbd4aac metadata.xml 249
@@ -47,16 +34,13 @@ SHA256 1dc990d64e5b42c9b17d7358c9f0af7d26702f575957482d93c8fd12a556cc11 metadata
 MD5 2e3449a29253129ea374a1d9bddfbf3b files/digest-g15composer-1.1 247
 RMD160 e5459c4b33b6fe418262b541f0e85577e7c14a33 files/digest-g15composer-1.1 247
 SHA256 b091cfe0c46fdb2c731d12fa43710413903dce760c5089ffd83b94caa3fbb0b7 files/digest-g15composer-1.1 247
-MD5 ad564ac6f85ae02f5be612d60857be5e files/digest-g15composer-3.0.2 256
-RMD160 217dba877df80827bd2cf625dc7c85fa79560c64 files/digest-g15composer-3.0.2 256
-SHA256 ea6157b0857fd484a28d253e10ce676238a4ad5df6b4067c59f4743fd15f8d87 files/digest-g15composer-3.0.2 256
 MD5 81748aade50921301a6751d0c7474dc5 files/digest-g15composer-3.1 250
 RMD160 584a33a610c9bfb777a9292a7783f81263d42f34 files/digest-g15composer-3.1 250
 SHA256 cc37198f5e1867ec430200b6343b7011ccbe4d7a958cd35534c98e72f59646b4 files/digest-g15composer-3.1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF+QhOV3J2n04EauwRAqvyAJ9nmYAzgG7zorpQxjqh9n+3hxldDQCgpybV
-/MEjuQJSt8VECM5oMdsg+68=
-=2Tkk
+iD8DBQFF+SOjyZx3L/ph1soRAifmAJ9KITZ24AU56Gah97TvFxNGyUXLpgCfQKP/
+4LZIe/O6P+C2c5YWOWHsWT8=
+=E61x
 -----END PGP SIGNATURE-----

diff --git a/app-misc/g15composer/files/digest-g15composer-3.0.2 b/app-misc/g15composer/files/digest-g15composer-3.0.2
deleted file mode 100644 (file)
index b8eb929..0000000
--- a/app-misc/g15composer/files/digest-g15composer-3.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a8b14dc104bf74c0c2dcfb408f0710f g15composer-3.0.2.tar.bz2 101556
-RMD160 df548cbcffffa5f5e316b852a5f166ae48ab8fd4 g15composer-3.0.2.tar.bz2 101556
-SHA256 615e2991a2de9b656be2550e90ac874c26dba650f4af1fd21feb3f0bda3150c0 g15composer-3.0.2.tar.bz2 101556

diff --git a/app-misc/g15composer/files/g15composer-3.0.2.confd b/app-misc/g15composer/files/g15composer-3.0.2.confd
deleted file mode 100644 (file)
index 4007480..0000000
--- a/app-misc/g15composer/files/g15composer-3.0.2.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/conf.d/g15composer: Configuration for the g15composer
-
-# The CONTROL_FIFO is the name of the FIFO that g15composer listens to.
-# It does not create a screen on the display, but allows programs to
-# create their own non-virtual screens.
-# Please make sure the file specified does not exist.
-
-CONTROL_FIFO="/var/run/g15composer"

diff --git a/app-misc/g15composer/files/g15composer-3.0.2.initd b/app-misc/g15composer/files/g15composer-3.0.2.initd
deleted file mode 100644 (file)
index b06f64c..0000000
--- a/app-misc/g15composer/files/g15composer-3.0.2.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/files/g15composer-3.0.2.initd,v 1.1 2007/01/02 03:42:21 rbu Exp $
-
-PIDFILE=/var/run/${SVCNAME}.pid
-
-depend() {
-       need g15daemon
-}
-
-start() {
-       ebegin "Starting ${SVCNAME}"
-       start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec /usr/bin/g15composer -- -b "${CONTROL_FIFO}"
-       chmod 720 "${CONTROL_FIFO}"
-       chgrp users "${CONTROL_FIFO}"
-       eend $?
-}
-
-stop() {
-       ebegin "Stoping ${SVCNAME}"
-       start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
-       rm "${CONTROL_FIFO}"
-       eend $?
-}

diff --git a/app-misc/g15composer/g15composer-1.1.ebuild b/app-misc/g15composer/g15composer-1.1.ebuild
index 8a6d3434981617c1e525819fa4c76903d9f0e0bf..e32d20a8b260b59ae898577d27f615a047a5ceba 100644 (file)
--- a/app-misc/g15composer/g15composer-1.1.ebuild
+++ b/app-misc/g15composer/g15composer-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-1.1.ebuild,v 1.6 2007/01/07 03:21:17 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-1.1.ebuild,v 1.7 2007/03/15 10:44:39 rbu Exp $
 
 inherit eutils
 
@@ -23,6 +23,13 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
        sys-apps/coreutils"
 
+pkg_setup() {
+       if use truetype && ! built_with_use dev-libs/libg15render truetype ; then
+               eerror "dev-libs/libg15render must be built with USE=\"truetype\" for truetype to work."
+               die "Please rebuild the package with corrected USE flags."
+       fi
+}
+
 src_compile() {
        econf \
                $(use_enable truetype ttf ) \

diff --git a/app-misc/g15composer/g15composer-3.0.2.ebuild b/app-misc/g15composer/g15composer-3.0.2.ebuild
deleted file mode 100644 (file)
index 5b8efb7..0000000
--- a/app-misc/g15composer/g15composer-3.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.0.2.ebuild,v 1.4 2007/02/18 19:03:19 rbu Exp $
-
-inherit eutils
-
-DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="amarok truetype"
-
-RDEPEND="app-misc/g15daemon
-       dev-libs/libg15render
-       truetype? ( media-libs/freetype )
-       amarok? ( kde-base/kdelibs  dev-perl/DCOP-Amarok-Player )"
-
-DEPEND="${RDEPEND}
-       dev-libs/libg15"
-
-pkg_setup() {
-       if use amarok && ! built_with_use dev-lang/perl ithreads ; then
-               echo
-               eerror "dev-lang/perl must be built with USE=\"ithreads\" for the Amarok display to work."
-               die
-       fi
-}
-
-src_compile() {
-       econf \
-               $(use_enable truetype ttf ) \
-               || die "configure failed"
-
-       emake || die "make failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       newinitd "${FILESDIR}/${P}.initd" ${PN}
-       newconfd "${FILESDIR}/${P}.confd" ${PN}
-
-       dodoc AUTHORS README ChangeLog
-
-       exeinto "/usr/share/${PN}"
-       doexe examples/*
-
-       if use amarok ; then
-               exeinto "/usr/share/apps/amarok/scripts"
-               newexe examples/amarok-g15-perl.pl g15-display.pl
-       fi
-}
-
-pkg_postinst() {
-       if use amarok; then
-               elog "g15-display.pl was installed into your Amarok script directory."
-               elog "To start it, have a look at Tools -> Script Manager in the Amarok menu."
-       fi
-}

diff --git a/app-misc/g15composer/g15composer-3.1.ebuild b/app-misc/g15composer/g15composer-3.1.ebuild
index 68e4665658cb34591af67ff5a7a12b403678123c..637cc1b9cc8df258345b2ec5a5bc0de43cef66b4 100644 (file)
--- a/app-misc/g15composer/g15composer-3.1.ebuild
+++ b/app-misc/g15composer/g15composer-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.1.ebuild,v 1.4 2007/03/15 08:48:05 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.1.ebuild,v 1.5 2007/03/15 10:44:39 rbu Exp $
 
 inherit eutils
 
@@ -22,10 +22,18 @@ RDEPEND="${DEPEND}
        amarok? ( dev-perl/DCOP-Amarok-Player )"
 
 pkg_setup() {
+       local failure=false
+       echo
        if use amarok && ! built_with_use dev-lang/perl ithreads ; then
-               echo
                eerror "dev-lang/perl must be built with USE=\"ithreads\" for the Amarok display to work."
-               die
+               failure=true
+       fi
+       if use truetype && ! built_with_use dev-libs/libg15render truetype ; then
+               eerror "dev-libs/libg15render must be built with USE=\"truetype\" for truetype to work."
+               failure=true
+       fi
+       if ${failure}; then
+               die "Please rebuild the packages with corrected USE flags."
        fi
 }