gentoo resync : 05.02.2020

3 files changed, 7 insertions, 103 deletions

diff --git a/media-plugins/vdr-graphlcd/Manifest b/media-plugins/vdr-graphlcd/Manifest
index 2c4ef9cce018..87425e7f2459 100644
--- a/media-plugins/vdr-graphlcd/Manifest
+++ b/media-plugins/vdr-graphlcd/Manifest
@@ -1,8 +1,6 @@
 AUX confd 565 BLAKE2B caf5867788b96423ba701ea645e212442f7881bb0d16b3c13924b64ff049a8e5dc48ead17f6b197ec4354525d53c168975e78c5650e34ab3a020ceffee0d0c15 SHA512 9b44466d924f5e7ea3ab23ade147a5c18b599714058c51fe8403cb7a0d2cd2be05fcc85a385a064c8b3110a6c88faa857444f6e4dee6c1843348209491e9ea99
 AUX rc-addon.sh 247 BLAKE2B f02545696c534397a2667e55e60d1c05067f4f11504ca724a4da71e71d8feb727a13d19601fbf7a08f15fa984139074da73cdd3dcf0ac9f3024af094ec87b149 SHA512 46d27b5feab6881721f480d6cc26e1a9796c9b46f083cf6e2f97523f8b54d2b93d373130e562235ec2a57d95cc37ac956e290467251572f5387db58a32ad1544
 AUX vdr-graphlcd-1.0.1_no-font.patch 1080 BLAKE2B 1ddf114f5d495970fb7662ca622448ecd7bce4a766dd21cd3c2a774f7167c02abe0585307ef3d42899d23f7f03f90184064aab5208dbcd3c7aaa42929f603475 SHA512 56d1631430dafb94e25861cabfc719ea5e8c843802938c0715ee342be4870f9216010a8de214f8f16f58ec640deb3d8df7f4657a48f6f80a76e36c8e0c2864b6
-DIST vdr-plugin-graphlcd-1.0.0.tar.bz2 888495 BLAKE2B 0557e0750cfa6baf16b2ca5d6e5b69b206d493717e9337fb84403b171b1a4a558fbbc77e32e2f00c1cc0aaadb1390f807e3cd578725aa2ad6786d037c4bb3251 SHA512 05994707b8e8a5640db3c9d4ea991d81b92d6d3e88de98ffc8a4bdac3b885fed2780958babbfec0967209aa15043a3799f08de0d3005ec6eeabf130de7879822
 DIST vdr-plugin-graphlcd-1.0.1.tar.bz2 888594 BLAKE2B 852b39a9c38583f9927718966d8f2b7d86da105450f7ab383a50bafd2d2c9a0e8acb000f7ac03603e6f81c9b12c22af27c3713e3a14409743c61cb696968b304 SHA512 2d7ec1018013b54dd17bf894cc7dc4ecfbbc549d18b6cf64460891204ca8b5cc84b0d756a2ab866011b11d4525e0c1fe93bf90f447a195044717b8f63a878566
-EBUILD vdr-graphlcd-1.0.0.ebuild 2621 BLAKE2B 231fce4e41eced133aeca5f492d8708320d2a0a4aa267349cdc5c8c68d8e5ceedac20ae52d7af109dc336a913c9089802059c5e3ce749ac56a9f2919786b6483 SHA512 a0012f54b3aa46657fd219395c5f39e08a1d019b9f64a3e6668df4d20bca5d05aa76644f89d636b9d6e7110ab09a9ca44417b4808a716af942096fe7021d0175
-EBUILD vdr-graphlcd-1.0.1.ebuild 2791 BLAKE2B 3c0c1f591f1614be2608cda3b0f63d192a679657032b4785f71ee65214b9c334ffb12185879119783bd92b7d1e95ec1a90929ca2951f4d0d1955143729223392 SHA512 59c98ca83c724d2335356d4eaf6b715d731c2feb5c5fcec3190844cc64c057a5912cb29d22ee5d57bdcc99b24b88b8da5f97759485ab98e6e8387d8f2c550279
+EBUILD vdr-graphlcd-1.0.1.ebuild 2686 BLAKE2B ac6030c7b526fca446965d458c3196aca6b146776b65d7b39ec1dce9685f149efd8b8441628c87410cd5307000dbf1a02a29ab4cd1af699a9f796f4aa0e1a1dd SHA512 0f2ee352ff4acac4d73e59dd7bce9d9be423e8c5035da2bdbc56ed1814ac8c8f5c6124edbc61f7dcc11a6a7c2bd7769877c6cbb9940d2d0c1040ba5f774a7323
 MISC metadata.xml 386 BLAKE2B 01915199322435f52711438e316c24feea4ab2852007d26deac46e5f5615c0e3cc5f8b4013a2391acbe4d666d3cc8681b000899434ed9df5ab4f00289f6b3333 SHA512 505462c67b43399c55d08deedd022a88e9a25659a6f9b150800d344bfe7e14cc1e8e73b6789401b7acd519bdfcae170743c898c4c4a354f13a9b1542f273e951
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.0.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.0.ebuild
deleted file mode 100644
index 8364adc443f5..000000000000
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="vdr-plugin-graphlcd"
-MY_P="${MY_PN}-${PV}"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: support output on Graphical LCD"
-HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd"
-SRC_URI="https://projects.vdr-developer.org/git/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=media-video/vdr-1.6
-	>=app-misc/graphlcd-base-${PV}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if ! getent group lp | grep -q vdr; then
-		einfo
-		einfo "Add user 'vdr' to group 'lp' for full user access to parport device"
-		elog
-		elog "User vdr added to group lp"
-		gpasswd -a vdr lp || die
-	fi
-	if ! getent group usb | grep -q vdr; then
-		einfo
-		einfo "Add user 'vdr' to group 'usb' for full user access to usb device"
-		elog
-		elog "User vdr added to group usb"
-		gpasswd -a vdr usb || die
-	fi
-}
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	sed -i "s:/usr/local:/usr:" Makefile || die
-	sed -i "s:i18n.c:i18n.h:g" Makefile || die
-	sed -i "s:include \$(VDRDIR)/Make.global:-include \$(VDRDIR)/Make.global:" Makefile || die
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insopts -m0644 -ovdr -gvdr
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/logos
-	doins -r ${VDRPLUGIN}/logos/*
-
-	insinto /usr/share/vdr/${VDRPLUGIN}/fonts
-	doins ${VDRPLUGIN}/fonts/*.fnt
-
-	for font in /usr/share/fonts/corefonts/*.ttf; do
-		elog ${font}
-		dosym ${font} ../../usr/share/vdr/graphlcd/fonts
-	done
-
-	insinto /etc/vdr/plugins/${VDRPLUGIN}
-	doins ${VDRPLUGIN}/channels.alias
-
-	dosym /usr/share/vdr/${VDRPLUGIN}/fonts ../../../../etc/vdr/plugins/${VDRPLUGIN}/fonts
-	dosym /usr/share/vdr/${VDRPLUGIN}/logos ../../../..//etc/vdr/plugins/${VDRPLUGIN}/logos
-	dosym /etc/graphlcd.conf ../etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf
-
-	dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3 ../../../../etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
-}
-
-pkg_preinst() {
-	if [[ -e /etc/vdr/plugins/graphlcd/fonts ]] && [[ ! -L /etc/vdr/plugins/graphlcd/fonts ]] \
-	|| [[ -e /etc/vdr/plugins/graphlcd/logos ]] && [[ ! -L /etc/vdr/plugins/graphlcd/logos ]] ; then
-		elog "Remove wrong DIR in /etc/vdr/plugins/graphlcd from prior install"
-		rm -R /etc/vdrplugins/graphlcd/{fonts,logos} || die
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "Add additional options in /etc/conf.d/vdr.graphlcd"
-	elog
-	elog "Please copy or link one of the supplied fonts.conf.*"
-	elog "files in /etc/vdr/plugins/graphlcd/ to"
-	elog "/etc/vdr/plugins/graphlcd/fonts.conf"
-}
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1.ebuild
index ee0b2a5045de..461c365b4d28 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,14 +66,14 @@ src_install() {
 	doins ${VDRPLUGIN}/channels.alias
 
 	# do we need this sym link? need testing..
-	dosym "${EPREFIX}/usr/share/fonts/corefonts" "${EPREFIX}/usr/share/vdr/graphlcd/fonts"
+	dosym "../../fonts/corefonts" "/usr/share/vdr/graphlcd/fonts"
 
-	dosym "${EPREFIX}/usr/share/fonts/corefonts" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/fonts"
-	dosym "${EPREFIX}/usr/share/vdr/${VDRPLUGIN}/logos" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/logos"
-	dosym "${EPREFIX}/etc/graphlcd.conf" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf"
+	dosym "../../../../usr/share/fonts/corefonts" "/etc/vdr/plugins/${VDRPLUGIN}/fonts"
+	dosym "../../../../usr/share/vdr/${VDRPLUGIN}/logos" "/etc/vdr/plugins/${VDRPLUGIN}/logos"
+	dosym "../../../etc/graphlcd.conf" "/etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf"
 
 	# do we need this sym link? need testing..
-#	dosym "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/logonames.alias"
+#	dosym "logonames.alias.1.3" "/etc/vdr/plugins/${VDRPLUGIN}/logonames.alias"
 }
 
 pkg_preinst() {