diff options
Diffstat (limited to 'app-misc/g15composer')
| -rw-r--r-- | app-misc/g15composer/Manifest | 7 | ||||
| -rw-r--r-- | app-misc/g15composer/files/g15composer-3.1.confd | 17 | ||||
| -rw-r--r-- | app-misc/g15composer/files/g15composer-3.1.initd | 48 | ||||
| -rw-r--r-- | app-misc/g15composer/files/g15composer-3.2-docdir.patch | 11 | ||||
| -rw-r--r-- | app-misc/g15composer/g15composer-3.1.ebuild | 38 | ||||
| -rw-r--r-- | app-misc/g15composer/g15composer-3.2-r1.ebuild (renamed from app-misc/g15composer/g15composer-3.2.ebuild) | 15 |
6 files changed, 20 insertions, 116 deletions
diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest index 3c6f362f3d8a..334f757e1ad4 100644 --- a/app-misc/g15composer/Manifest +++ b/app-misc/g15composer/Manifest @@ -1,10 +1,7 @@ -AUX g15composer-3.1.confd 695 BLAKE2B c2a36ee0abd83b7d9ad4c6f3610a50cfd7e9dd4ae1c09d2d58cf2f4f54a9c46441b068d5e145c9a0023e7a510c80391294d90dbf493510ff7b83edf11b4420d3 SHA512 58c137d67f83a00a18f80ece66f3b41a402371d680a6527367df12bf574b4a1450ef130bab055d7940ce7b94534103108fa63cb0b97c585f0d69a67a14ec7bbb -AUX g15composer-3.1.initd 1249 BLAKE2B bbda2808606485c186b13f84133fd654a82189ee2f6693d5cfd7dd06846b3663db7d5b08c0df9841cd2ccfe2af0ba74a514589a3efff21dfa61363258ee80b34 SHA512 1e63a8ec482874df65a7685b0eb671be264b1228fdf53a6cf6f3efcc18b7b0a7d511572f99318013bb86b099e66827e44bcb060ba1d13b2af4699e4a9f6b02eb +AUX g15composer-3.2-docdir.patch 420 BLAKE2B 3b965ace9c7eb7a0d0d4739d35f702dbac37000194c560814e82f6cc41072661621a70d0289782e5d5473ee2b7567d0a49b85e917d1d1a44206344082b6052b5 SHA512 340a4dceebcf65a2505a1d67a7a0b13314c4b04e98e8cdbfe479a8c9dbf5c68da6522136d7224fee95f22934e4e3d7e3911114c2e921547888e42a2e3ffd0cb0 AUX g15composer-3.2-freetype_pkgconfig.patch 1669 BLAKE2B 75e14fe368c3f1ee5adf357d339fd05773f8dcce279c488a413bc9b69c51abdc02425eeb2fadbb3ba52d2b8baf7d93aac72e981d31c7bf09ba8a6e0206178844 SHA512 6ae9a18927b8fc2066746b8c7532a3e9bb31432ed3ce2af59fbe02a741334b1ae18886e84b10480243f7b4b9001f9931d817efa1c4077d6f775f072c7f2488cc AUX g15composer-3.2.confd 695 BLAKE2B c2a36ee0abd83b7d9ad4c6f3610a50cfd7e9dd4ae1c09d2d58cf2f4f54a9c46441b068d5e145c9a0023e7a510c80391294d90dbf493510ff7b83edf11b4420d3 SHA512 58c137d67f83a00a18f80ece66f3b41a402371d680a6527367df12bf574b4a1450ef130bab055d7940ce7b94534103108fa63cb0b97c585f0d69a67a14ec7bbb AUX g15composer-3.2.initd 1249 BLAKE2B bbda2808606485c186b13f84133fd654a82189ee2f6693d5cfd7dd06846b3663db7d5b08c0df9841cd2ccfe2af0ba74a514589a3efff21dfa61363258ee80b34 SHA512 1e63a8ec482874df65a7685b0eb671be264b1228fdf53a6cf6f3efcc18b7b0a7d511572f99318013bb86b099e66827e44bcb060ba1d13b2af4699e4a9f6b02eb -DIST g15composer-3.1.tar.bz2 104109 BLAKE2B 1880fd469dcbca5031724a23a5abee6d2242738a1674e2635d02aee20fa9859293fa383921f602bf04fb8bdaa294fad9aca099e56bd85b69d41d413f6561a309 SHA512 e4b0ddef2dfbfd3a8a392ebe9e53a59638cbb7aee7a007b8a20be388f074d54a27ed509a5805fadc9ffd708c027ec4c331dfab96905bee1c37690a5585198ad8 DIST g15composer-3.2.tar.bz2 105805 BLAKE2B 1a843ed50f0374cb23d469be9c083437f13279f5584e3112037635225e5d5df7765452e3e805c4230fd33782c300f5abdb1fc05e394f636d160c8e49baf3dde0 SHA512 95b033e2bb957ef4a2f3d3e2954a11454af7d8576e037f723d2a7d45a7dadde4908540ff0a66b387209e689217ba0e6677dcee1e647b792c402f250371518bc1 -EBUILD g15composer-3.1.ebuild 865 BLAKE2B 32655857abe852de9e6e7c3dda738048fbe9b5cb84740deeebec3b4f6b3eef44f1dbdf651452c2e38af6e1c2bc5b2e3433d365ccbf57e406a6105499188e1464 SHA512 154f43f5e1a276f9a57673349bd1edfda7c6427a3ff57cc039d05bd62d887ca60e7eefb71c0aed54fad757778e381c26459474ffc757972052e9a6b1a301434a -EBUILD g15composer-3.2.ebuild 1079 BLAKE2B 3a8a796a9cb74b3420c887e7c34e19ed7ae2bba36493b1db126fc2263e8df0c818468cd85f5fe462ced8308659d25514e0767af445b18c485da38d9a4df81c7a SHA512 6edd1c493c8e5acaaa8fca45748e23eca4862d7b0d207bf6f12801448b0b723177e4be283b81560588dfa48271c934e86d65905d54c6754c277642f8c5511b77 +EBUILD g15composer-3.2-r1.ebuild 1107 BLAKE2B 46db2e4afd4bdc1591c6781792f2998e1aa3827d14fed113723dd0b9e0fca24d99fa66057b9741ac17f8c26d0a1b0f587802759da1d370ce3b3f3b929c6cda70 SHA512 7f6554ace622fd63b76ffcaf98c14a93022be967eabc7f2b3e2d4b7ce388a14ac628d3993cb896f6463dd1efb4c5d56a308093724f25a66224d3be453dbc15a6 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d diff --git a/app-misc/g15composer/files/g15composer-3.1.confd b/app-misc/g15composer/files/g15composer-3.1.confd deleted file mode 100644 index f42ab956e242..000000000000 --- a/app-misc/g15composer/files/g15composer-3.1.confd +++ /dev/null @@ -1,17 +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" - -# Set the user who owns the CONTROL_FIFO. -# As this is also the user as whom g15composer is run, -# it has to be someone who can create further message channels -# This should be the user who runs the LCD clients -FIFO_USER= - -# Set the grop which owns the CONTROL_FIFO. -# The users who want to display screens on the LCD need to be in this group. -FIFO_GROUP=users diff --git a/app-misc/g15composer/files/g15composer-3.1.initd b/app-misc/g15composer/files/g15composer-3.1.initd deleted file mode 100644 index 0d7c24f85609..000000000000 --- a/app-misc/g15composer/files/g15composer-3.1.initd +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -PIDFILE=/var/run/${SVCNAME}.pid - -depend() { - need g15daemon -} - -start() { - ebegin "Starting ${SVCNAME}" - - if [ -z "${FIFO_USER}" -o -z "${FIFO_GROUP}" ] ; then - eerror "Please set the FIFO_USER and FIFO_GROUP variables in /etc/conf.d/${SVCNAME}" - eend 1 - return 1 - fi - if [ -e "${CONTROL_FIFO}" -a ! -p "${CONTROL_FIFO}" ] ; then - eerror "${CONTROL_FIFO} exists and is not a FIFO. Please remove." - eend 1 - return 1 - fi - if [ ! -p "${CONTROL_FIFO}" ] ; then - einfo "Creating FIFO at ${CONTROL_FIFO}" - mkfifo -m660 "${CONTROL_FIFO}" - else - einfo "Reusing FIFO at ${CONTROL_FIFO}" - fi - - chown ${FIFO_USER} "${CONTROL_FIFO}" - chgrp ${FIFO_GROUP} "${CONTROL_FIFO}" - start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec \ - /usr/bin/g15composer -- -b -u "${FIFO_USER}" -g "${FIFO_GROUP}" "${CONTROL_FIFO}" - eend $? -} - -stop() { - ebegin "Stoping ${SVCNAME}" - start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer - if [ -p "${CONTROL_FIFO}" ] ; then - einfo "Removing FIFO at ${CONTROL_FIFO}" - rm -f "${CONTROL_FIFO}" - else - ewarn "FIFO at ${CONTROL_FIFO} was lost" - fi - eend $? -} diff --git a/app-misc/g15composer/files/g15composer-3.2-docdir.patch b/app-misc/g15composer/files/g15composer-3.2-docdir.patch new file mode 100644 index 000000000000..cd81cde5de41 --- /dev/null +++ b/app-misc/g15composer/files/g15composer-3.2-docdir.patch @@ -0,0 +1,11 @@ +--- g15composer-3.2/Makefile.am ++++ g15composer-3.2/Makefile.am +@@ -3,7 +3,7 @@ + EXTRA_DIST = g15composer.l g15composer.y debian examples doc + noinst_HEADERS = g15composer.h g15c_logo.h + man1_MANS = $(top_srcdir)/doc/g15composer.1 +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) ++docdir = @docdir@ + doc_DATA = AUTHORS ChangeLog COPYING NEWS README + + g15composer.tab.c: g15composer.lex.c g15composer.y g15composer.h diff --git a/app-misc/g15composer/g15composer-3.1.ebuild b/app-misc/g15composer/g15composer-3.1.ebuild deleted file mode 100644 index 28ae4aaf5304..000000000000 --- a/app-misc/g15composer/g15composer-3.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15" -HOMEPAGE="https://sourceforge.net/projects/g15tools/" -SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="truetype examples" - -DEPEND="app-misc/g15daemon - >=dev-libs/libg15render-1.2[truetype?] - truetype? ( media-libs/freetype )" - -src_configure() { - econf \ - $(use_enable truetype ttf) -} - -src_install() { - default - - newinitd "${FILESDIR}/${P}.initd" ${PN} - newconfd "${FILESDIR}/${P}.confd" ${PN} - - if use examples ; then - exeinto "/usr/share/${PN}" - doexe examples/* - fi -} - -pkg_postinst() { - elog "Set the user to run g15composer in /etc/conf.d/g15composer before starting the service." -} diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2-r1.ebuild index 03f3cb42bbfd..747c325e7f3b 100644 --- a/app-misc/g15composer/g15composer-3.2.ebuild +++ b/app-misc/g15composer/g15composer-3.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -11,18 +11,17 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="truetype examples" DEPEND="app-misc/g15daemon >=dev-libs/libg15render-1.2[truetype?] - truetype? ( - media-libs/freetype - virtual/pkgconfig - )" + truetype? ( media-libs/freetype )" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch + "${FILESDIR}/${P}-freetype_pkgconfig.patch" + "${FILESDIR}/${P}-docdir.patch" ) src_prepare() { |