From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C538515808D for ; Sat, 23 Apr 2022 21:24:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AF1EE08E5; Sat, 23 Apr 2022 21:24:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFD0FE08F6 for ; Sat, 23 Apr 2022 21:24:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3343C341D34 for ; Sat, 23 Apr 2022 21:24:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 723D9DC for ; Sat, 23 Apr 2022 21:24:01 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1650746475.6e089dc724ac10bd031632cb715564c9be2be542.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/lcdproc/, app-misc/lcdproc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/lcdproc/Manifest app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild X-VCS-Directories: app-misc/lcdproc/ app-misc/lcdproc/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 6e089dc724ac10bd031632cb715564c9be2be542 X-VCS-Branch: master Date: Sat, 23 Apr 2022 21:24:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b13014d-7ad3-4e70-8412-c98f5e2935bd X-Archives-Hash: 2c232b0495069b3d22c7c78fb516bbf0 commit: 6e089dc724ac10bd031632cb715564c9be2be542 Author: Conrad Kostecki gentoo org> AuthorDate: Sat Apr 23 20:41:15 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Apr 23 20:41:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e089dc7 app-misc/lcdproc: drop 0.5.9_p20200721-r2 Signed-off-by: Conrad Kostecki gentoo.org> app-misc/lcdproc/Manifest | 1 - .../lcdproc-0.5.9-use-freetype2-pkg-config.patch | 15 -- app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild | 223 --------------------- 3 files changed, 239 deletions(-) diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest index ae6719b58531..4a7327a55378 100644 --- a/app-misc/lcdproc/Manifest +++ b/app-misc/lcdproc/Manifest @@ -1,2 +1 @@ -DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd DIST lcdproc-0.5.9_p20211220.tar.gz 941272 BLAKE2B 910504e86a8c3b2c764b20b175b76287166c6fa1d93fec74e7ea91adc7027530a40f415c26c2820f300d2bf5222e9bebec082aedf76b53d0a70a386c91b8d540 SHA512 6901a92cb8d7102f5fb429d59d416fcd98b57e1cae41bddbfe592befaa97738acff3d46be250cbb5b1ad012322f88ac549d220e96aa399bb4cd8c19ee28407c8 diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch deleted file mode 100644 index 9149bf784276..000000000000 --- a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.ac 2017-06-18 22:33:56.000000000 +0200 -+++ b/configure.ac 2018-10-04 22:30:22.668770478 +0200 -@@ -389,11 +389,7 @@ - AC_MSG_RESULT($enable_freetype) - - if test "$enable_freetype" = "yes"; then -- ifdef([AC_CHECK_FT2], -- [AC_CHECK_FT2([], -- [AC_DEFINE(HAVE_FT2, [1], [Define to 1 if you have freetype])], -- [enable_freetype=no])], -- [AC_MSG_WARN([freetype does not seem to be installed])]) -+ PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [enable_freetype="yes"],[enable_freetype="no"]) - fi - AC_SUBST([FT2_CFLAGS]) - AC_SUBST([FT2_LIBS]) diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild deleted file mode 100644 index 32ab3bf75e73..000000000000 --- a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1" - -inherit autotools systemd - -DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD" -HOMEPAGE="http://www.lcdproc.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -KEYWORDS="amd64 ppc ppc64 x86" -LICENSE="GPL-2" -SLOT="0" -IUSE="debug doc ethlcd extra-charmaps menu nfs png samba test-menu truetype" -REQUIRED_USE=" - ethlcd? ( lcd_devices_hd44780 ) - png? ( lcd_devices_glcd ) - truetype? ( lcd_devices_glcd ) -" - -# Define the list of valid lcd devices. -# Some drivers were removed from this list: -# - svga: It needs media-libs/svgalib, which is masked and obsolete. -IUSE_LCD_DEVICES=( - bayrad CFontz CFontzPacket curses CwLnx ea65 - EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd - icp_a106 imon imonlcd IOWarrior irman irtrans - joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a - ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD - Olimex_MOD_LCD1x9 picolcd pyramid rawserial - sdeclcd sed1330 sed1520 serialPOS serialVFD - shuttleVFD sli stv5730 SureElec t6963 text - tyan ula200 vlsys_m428 xosd yard2LCD -) - -# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE' -REQUIRED_USE+=" || ( " -for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do - LCD_DEVICE="${LCD_DEVICE,,}" - IUSE+=" lcd_devices_${LCD_DEVICE} " - REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} " -done -IUSE="${IUSE/lcd_devices_glcd/+lcd_devices_glcd}" -REQUIRED_USE+=" ) " -unset LCD_DEVICE - -# Define dependencies for all drivers in 'IUSE_LCD_DEVICES' -DEPEND_LCD_DEVICES=" - lcd_devices_cfontz? ( dev-libs/libhid:= ) - lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) - lcd_devices_cwlnx? ( dev-libs/libhid:= ) - lcd_devices_futaba? ( virtual/libusb:1= ) - lcd_devices_g15? ( - app-misc/g15daemon - dev-libs/libg15render:= - virtual/libusb:0= - ) - lcd_devices_glcd? ( - app-misc/glcdprocdriver:= - dev-embedded/libftdi:1= - dev-libs/libhid:= - dev-libs/serdisplib:= - virtual/libusb:0= - x11-libs/libX11:= - ) - lcd_devices_hd44780? ( - dev-embedded/libftdi:1= - dev-libs/libugpio:= - virtual/libusb:0= - ) - lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) - lcd_devices_irman? ( media-libs/libirman:= ) - lcd_devices_iowarrior? ( virtual/libusb:0= ) - lcd_devices_lirc? ( app-misc/lirc ) - lcd_devices_lis? ( dev-embedded/libftdi:1= ) - lcd_devices_lb216? ( dev-libs/libhid:= ) - lcd_devices_mdm166a? ( dev-libs/libhid:= ) - lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) - lcd_devices_mx5000? ( app-misc/mx5000tools ) - lcd_devices_noritakevfd? ( dev-libs/libhid:= ) - lcd_devices_picolcd? ( virtual/libusb:1= ) - lcd_devices_shuttlevfd? ( virtual/libusb:0= ) - lcd_devices_ula200? ( dev-embedded/libftdi:1= ) - lcd_devices_xosd? ( - x11-libs/libX11:= - x11-libs/xosd:= - ) -" - -RDEPEND="${DEPEND_LCD_DEVICES}" - -DEPEND=" - ${RDEPEND} - doc? ( - app-doc/doxygen[dot] - app-text/xmlto - ) - nfs? ( net-fs/nfs-utils ) - png? ( media-libs/libpng:0= ) - samba? ( net-fs/samba ) - truetype? ( media-libs/freetype:2= ) -" - -DOCS=( "CREDITS.md" "TODO" ) - -PATCHES=( "${FILESDIR}/${PN}-0.5.9-use-freetype2-pkg-config.patch" ) - -src_prepare() { - default - - # Fix path for modules - sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die - - eautoreconf -} - -src_configure() { - # Enable all users enabled lcd devices - local myeconfargs_lcd_devices - for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do - if use "lcd_devices_${lcd_device,,}"; then - myeconfargs_lcd_devices+=",${lcd_device}" - fi - done - - local enable_ftdi="--disable-libftdi" - if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then - enable_ftdi="--enable-libftdi" - fi - - local enable_hid="--disable-libhid" - if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then - enable_hid="--enable-libhid" - fi - - local enable_png="--disable-libpng" - use lcd_devices_glcd && enable_png="" - - local enable_usb0="--disable-libusb" - if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then - enable_usb0="--enable-libusb" - fi - - local enable_usb1="--disable-libusb-1-0" - if use lcd_devices_futaba || use lcd_devices_picolcd; then - enable_usb1="--enable-libusb-1-0" - fi - - local enable_x11="--disable-libX11" - use lcd_devices_glcd && enable_x11="--enable-libX11" - - local myeconfargs=( - --enable-drivers="${myeconfargs_lcd_devices#,}" - $(use_enable debug) - $(use_enable doc doxygen) - $(use_enable doc dot) - $(use_enable doc html-dox) - $(use_enable doc latex-dox) - $(use_enable ethlcd) - $(use_enable extra-charmaps) - $(use_enable menu lcdproc-menus) - $(use_enable nfs stat-nfs) - $(use_enable samba stat-smbfs) - $(use_enable test-menu testmenus) - $(use_enable truetype freetype) - ${enable_ftdi} - ${enable_hid} - ${enable_png} - ${enable_usb0} - ${enable_usb1} - ${enable_x11} - --with-lcdport="13666" - --with-pidfile-dir="/run" - --without-included-getopt - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc; then - emake dox - - local docbook - for docbook in lcdproc-user lcdproc-dev; do - cd "${S}"/docs/"${docbook}" || die - xmlto html "${docbook}".docbook || die - done - fi -} - -src_install() { - default - - # Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients' - rm -f "${ED}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die - insinto /usr/share/lcdproc/clients - doins clients/examples/*.pl clients/metar/*.pl - - newinitd "${FILESDIR}"/LCDd.initd LCDd - newinitd "${FILESDIR}"/lcdexec.initd lcdexec - newinitd "${FILESDIR}"/lcdproc.initd lcdproc - - systemd_dounit "${FILESDIR}"/LCDd.service - systemd_dounit "${FILESDIR}"/lcdexec.service - systemd_dounit "${FILESDIR}"/lcdproc.service - - if use doc; then - dodoc -r docs/html - - local docbook - for docbook in lcdproc-user lcdproc-dev; do - docinto "${docbook}" - dodoc docs/"${docbook}"/*.html - done - fi -}