diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/Manifest.gz | bin | 49293 -> 49306 bytes | |||
| -rw-r--r-- | sys-apps/qingy/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/qingy/metadata.xml | 17 | ||||
| -rw-r--r-- | sys-apps/qingy/qingy-1.0.0-r6.ebuild (renamed from sys-apps/qingy/qingy-1.0.0-r5.ebuild) | 90 |
4 files changed, 53 insertions, 58 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 5efac5270d12..bb00d8bd98b5 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest index d0c4d81a0d24..3037efff97f4 100644 --- a/sys-apps/qingy/Manifest +++ b/sys-apps/qingy/Manifest @@ -5,5 +5,5 @@ AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd -EBUILD qingy-1.0.0-r5.ebuild 3815 BLAKE2B 63dc40f007d959a6a464170b0e951fffcdf73848a4fbc02b27e9d77cf9af5877479a760c4829fa1f911aad3eb314f53a9d4717076202d4bbbf3b59c5a02a890d SHA512 1843335664b3499802db4c4c7c5611a13ed9b2a425902f1d0cfa0ececfdf7289d163dc1e937c371153c4dd26f71054b3d46dec8ac17d919b3d9625ddd2e6fd79 -MISC metadata.xml 456 BLAKE2B e1f3ff219a89e6d68aab35976c2b35bdecaeaec940203372172da862827e1fde5c6e64255e4902b3eff881e2f9a183df595f2590473bd007b49ab034ce32090c SHA512 456eee5396d6e4d1732527e1a19670914f0440451281591510a8720a3a8f228eb0b6cbc8975961d8e6677a1f18fd95769d2818765517cd30e5d2404de61dbefb +EBUILD qingy-1.0.0-r6.ebuild 3441 BLAKE2B 55a7bb135a1b47f571d4e8a8672bb9c129bff6014b1f7169a92a3b1a7de558d4262d5d0262ce4c94acb9e53717ddc0f6b5aa869323763285f2f41d3b86fb2d69 SHA512 f9887b425ffc1b6739ab9383c80f7b0e5bfc004ec1f5eceaa9634a7f4ff884f3bbd394832858d29ea3201d45f2ea39f322dab2f17cfc8e497a4515a165be87ef +MISC metadata.xml 333 BLAKE2B fe731847e02cb858ca1930133cfcdee5cdba2be74b750be85f6ed78d0c6e886618609c71efef516c25c193bd3d8e14728b2764f5d16b31eae9c8fbbaba03c58c SHA512 c181398d2eb670f1f61153f586579efb62245e89f5385cb94cd6a1b56990c8179c0de8cb77730f7f9abb9e80453108b3f07fa0fb9ebf93c257c1970f6875d77a diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml index 21101f532d82..ff40f99a6e5b 100644 --- a/sys-apps/qingy/metadata.xml +++ b/sys-apps/qingy/metadata.xml @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<use> - <flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag> -</use> -<upstream> - <remote-id type="sourceforge">qingy</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">qingy</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-apps/qingy/qingy-1.0.0-r5.ebuild b/sys-apps/qingy/qingy-1.0.0-r6.ebuild index 8d1f43027b02..3c0a19cf677b 100644 --- a/sys-apps/qingy/qingy-1.0.0-r5.ebuild +++ b/sys-apps/qingy/qingy-1.0.0-r6.ebuild @@ -1,27 +1,28 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools elisp-common epatch flag-o-matic pam systemd +inherit autotools elisp-common flag-o-matic pam systemd GENTOO_THEME_VERSION="2.1" DESCRIPTION="A DirectFB getty replacement" HOMEPAGE="http://qingy.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.bz2 mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2 - https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz" + https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz +" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="crypt emacs gpm opensslcrypt pam static X" +IUSE="crypt emacs gpm pam static X" -RDEPEND=" +DEPEND=" >=sys-libs/ncurses-5.7-r7:= - opensslcrypt? ( dev-libs/openssl:0= ) - crypt? ( >=dev-libs/libgcrypt-1.2.1:0= ) + crypt? ( >=dev-libs/libgcrypt-1.2.1:= ) emacs? ( >=app-editors/emacs-23.1:* ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( @@ -29,50 +30,46 @@ RDEPEND=" x11-libs/libXScrnSaver:= ) " -DEPEND="${RDEPEND} - virtual/pkgconfig -" -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} pam? ( sys-auth/pambase ) " +BDEPEND="virtual/pkgconfig" SITEFILE="50${PN}-gentoo.el" -src_prepare() { - eapply "${FILESDIR}"/${P}-tinfo.patch +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch # bug #359637 and bug #462634 - fixes from upstream - epatch "${DISTDIR}"/${P}-screensavers.patch.gz + "${WORKDIR}"/${P}-screensavers.patch +) + +src_prepare() { default + mv configure.in configure.ac || die eautoreconf } src_configure() { append-cflags -fcommon - local crypto_support="--disable-crypto" - local emacs_support="--disable-emacs --without-lispdir" - if use crypt && use opensslcrypt; then - echo - ewarn "You can have openssl or libgcrypt as a crypto library, not both." - ewarn "Using libgcrypt now..." - echo - fi + local myeconfargs=( + --sbindir=/sbin + --with-lispdir="${SITELISP}"/${PN} + --disable-optimizations + --disable-static + --disable-DirectFB-support + + $(use_enable emacs) + $(use_enable pam) + $(use_enable static static-build) + $(use_enable gpm gpm-lock) + $(use_enable X x-support) + $(use_enable crypt crypto libgcrypt) + ) - use emacs && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}" - use opensslcrypt && crypto_support="--enable-crypto=openssl" - use crypt && crypto_support="--enable-crypto=libgcrypt" - econf \ - --sbindir=/sbin \ - --disable-optimizations \ - --disable-static \ - --disable-DirectFB-support \ - $(use_enable pam) \ - $(use_enable static static-build) \ - $(use_enable gpm gpm-lock) \ - $(use_enable X x-support) \ - ${crypto_support} \ - ${emacs_support} + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" } src_install() { @@ -82,18 +79,19 @@ src_install() { # Install the program default - find "${D}" -name '*.la' -delete || die + + find "${ED}" -name '*.la' -delete || die # Set the settings file umask to 600, in case somebody # wants to make use of the autologin feature - /bin/chmod 600 "${D}"/etc/qingy/settings + fperms 600 /etc/qingy/settings # Install Gentoo theme dodir /usr/share/${PN}/themes/gentoo - cp "${WORKDIR}"/gentoo/* "${D}"/usr/share/${PN}/themes/gentoo || die + cp "${WORKDIR}"/gentoo/* "${ED}"/usr/share/${PN}/themes/gentoo || die # Alter config file so that it uses our theme - sed -i 's/theme = "default"/theme = "gentoo"/' "${D}"/etc/${PN}/settings + sed -i 's/theme = "default"/theme = "gentoo"/' "${ED}"/etc/${PN}/settings || die # Install log rotation policy insinto /etc/logrotate.d @@ -101,7 +99,7 @@ src_install() { use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE} - rm "${D}"/etc/pam.d/qingy + rm "${ED}"/etc/pam.d/qingy || die if use pam; then pamd_mimic system-local-login qingy auth account password session @@ -111,11 +109,11 @@ src_install() { } pkg_postinst() { - einfo "In order to use qingy you must first edit your /etc/inittab" + einfo "In order to use qingy you must first edit your ${EROOT}/etc/inittab" einfo "Check the documentation at ${HOMEPAGE}" einfo "for instructions on how to do that." echo - einfo "Also, make sure to adjust qingy settings file (/etc/qingy/settings)" + einfo "Also, make sure to adjust qingy settings file (${EROOT}/etc/qingy/settings)" einfo "to your preferences/machine configuration..." if use crypt; then @@ -124,8 +122,8 @@ pkg_postinst() { echo ewarn "Note that sometimes a generated key-pair may pass the internal tests" ewarn "but fail to work properly. You will get a 'regenerate your keys'" - ewarn "message. If this is your case, please remove /etc/qingy/public_key" - ewarn "and /etc/qingy/private_key and run qingy-keygen again..." + ewarn "message. If this is your case, please remove ${EROOT}/etc/qingy/public_key" + ewarn "and ${EROOT}/etc/qingy/private_key and run qingy-keygen again..." fi use emacs && echo && elisp-site-regen |