From ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 May 2018 11:18:16 +0100 Subject: gentoo resync : 06.05.2018 --- app-misc/Manifest.gz | Bin 48621 -> 48622 bytes app-misc/g15composer/Manifest | 3 +- .../files/g15composer-3.2-freetype_pkgconfig.patch | 44 +++++++++++++++++++++ app-misc/g15composer/g15composer-3.2.ebuild | 30 +++++++++----- app-misc/hivex/Manifest | 2 +- app-misc/hivex/hivex-1.3.14.ebuild | 4 +- 6 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch (limited to 'app-misc') diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 76d0ea020190..d6e5c472687d 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest index a12c102c1d0d..96eed494623f 100644 --- a/app-misc/g15composer/Manifest +++ b/app-misc/g15composer/Manifest @@ -1,9 +1,10 @@ AUX g15composer-3.1.confd 695 BLAKE2B c2a36ee0abd83b7d9ad4c6f3610a50cfd7e9dd4ae1c09d2d58cf2f4f54a9c46441b068d5e145c9a0023e7a510c80391294d90dbf493510ff7b83edf11b4420d3 SHA512 58c137d67f83a00a18f80ece66f3b41a402371d680a6527367df12bf574b4a1450ef130bab055d7940ce7b94534103108fa63cb0b97c585f0d69a67a14ec7bbb AUX g15composer-3.1.initd 1249 BLAKE2B bbda2808606485c186b13f84133fd654a82189ee2f6693d5cfd7dd06846b3663db7d5b08c0df9841cd2ccfe2af0ba74a514589a3efff21dfa61363258ee80b34 SHA512 1e63a8ec482874df65a7685b0eb671be264b1228fdf53a6cf6f3efcc18b7b0a7d511572f99318013bb86b099e66827e44bcb060ba1d13b2af4699e4a9f6b02eb +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 963 BLAKE2B c897fff0e31d05313b51f945db3dcf66b153676e6c5cb5ef4899da41294d46a50761d63d25a9d314bd6a3461d10993564fc4d56d17ac5cdd41156d8ecf66c125 SHA512 5c21f3e923384bf0b3c5579c14b4d0fdf0340c554b63a8816c53ce80309285eb4ff2320024ffa989201af09e0e586ea888c841991863d1abbc5689936bfd3d56 -EBUILD g15composer-3.2.ebuild 966 BLAKE2B 14237eb4da40a9d639d71b3448a5357ce13fe37046d05c11e5c0684273a0b682103fc7ba8cabfaeed8660ea44ad61059d1a02457048c2de9f746d7f25a963f03 SHA512 8f2dad82ad203d364d6e698d3db5dd75ce6d7eded1a178fe2143911be46a946f8f25eee411b6a9c7129f2935fbc34b053b46253f16a030edb67bd83fe4e25757 +EBUILD g15composer-3.2.ebuild 1079 BLAKE2B 3a8a796a9cb74b3420c887e7c34e19ed7ae2bba36493b1db126fc2263e8df0c818468cd85f5fe462ced8308659d25514e0767af445b18c485da38d9a4df81c7a SHA512 6edd1c493c8e5acaaa8fca45748e23eca4862d7b0d207bf6f12801448b0b723177e4be283b81560588dfa48271c934e86d65905d54c6754c277642f8c5511b77 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d diff --git a/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch new file mode 100644 index 000000000000..9251e139322d --- /dev/null +++ b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch @@ -0,0 +1,44 @@ +--- g15composer-3.2/configure.in ++++ g15composer-3.2/configure.in +@@ -14,24 +14,24 @@ + AC_PROG_YACC + + # Checks for --enable args +-AC_MSG_CHECKING(whether to enable FreeType2 support) +-AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support], +- if [[[ "$enableval" = "yes" ]]]; then +- AC_CHECK_LIB([g15render], [g15r_ttfLoad], +- AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]) +- CFLAGS="$CFLAGS `freetype-config --cflags`" +- CXXFLAGS="$CXXFLAGS `freetype-config --cflags`" +- FTLIB="-lfreetype" +- ttf_support="yes", +- AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"]) +- ttf_support="no" +- ) +- else +- ttf_support="no" +- fi, +- ttf_support="no" ++AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],,enable_ttf="no") ++AS_IF([test "x$enable_ttf" = "xyes"], [ ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES(FREETYPE, freetype2, ++ [ ++ CFLAGS="$CFLAGS $FREETYPE_CFLAGS" ++ CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" ++ FTLIB="$FREETYPE_LIBS" ++ ], ++ AC_MSG_ERROR([Cannot find freetype2]) ++ ) ++ AC_CHECK_LIB([g15render], [g15r_ttfLoad], ++ AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]), ++ AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"]) ++ ) ++], ++ AC_MSG_RESULT(No Freetype is being used) + ) +-AC_MSG_RESULT($ttf_support) + + # Checks for libraries. + AC_CHECK_LIB([g15daemon_client], [g15_send], ,AC_MSG_ERROR(["libg15daemon_client not found. please install it"])) diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2.ebuild index 0ff4c93f649f..03f3cb42bbfd 100644 --- a/app-misc/g15composer/g15composer-3.2.ebuild +++ b/app-misc/g15composer/g15composer-3.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils +EAPI=6 + +inherit autotools DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15" HOMEPAGE="https://sourceforge.net/projects/g15tools/" @@ -15,21 +16,32 @@ IUSE="truetype examples" DEPEND="app-misc/g15daemon >=dev-libs/libg15render-1.2[truetype?] - truetype? ( media-libs/freetype )" + truetype? ( + media-libs/freetype + virtual/pkgconfig + )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} src_configure() { - econf \ - $(use_enable truetype ttf) + econf $(use_enable truetype ttf) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + local DOCS=( AUTHORS README ChangeLog ) + default newinitd "${FILESDIR}/${P}.initd" ${PN} newconfd "${FILESDIR}/${P}.confd" ${PN} - dodoc AUTHORS README ChangeLog - if use examples ; then exeinto "/usr/share/${PN}" doexe examples/* diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest index 1977e9948fb5..dd72f18c5a65 100644 --- a/app-misc/hivex/Manifest +++ b/app-misc/hivex/Manifest @@ -1,3 +1,3 @@ DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6 -EBUILD hivex-1.3.14.ebuild 1847 BLAKE2B 4ba68a7ff21627ac4d966ce452f2dfc025e8e49029849162f876c436bd45862883a735328d114296b4dca38cd874492c75d402b3fedf3f539c053fb779564803 SHA512 8b0c81ea83fe75d828a343f9d9aab08cf393c4f6fbc418462b10ca2a482177cad59073c00219d3953f5e3f5edde28553f0087728b31393171c0d60bded8d066e +EBUILD hivex-1.3.14.ebuild 1847 BLAKE2B 2a60983c776c5fb1da55b47a1f4c8194cbda6513068320d03dc2f80dbb1eaa8f57f9f53cca9357b5c15eb594f532faf1452ef502cf0d6ace211fe1b3aa56058c SHA512 5c707cdd6fa4830bcdfabd020a4b09ac976ac8754fd75eb51cf4fef14eb128300f666fbac0bcd1df623dcc71e73eed681a1cfbe0e4ac5a4924b8c5c2974d82a4 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild index e0f8af2406c1..b3217d11ff1e 100644 --- a/app-misc/hivex/hivex-1.3.14.ebuild +++ b/app-misc/hivex/hivex-1.3.14.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_OPTIONAL=yes PYTHON_COMPAT=(python2_7 python3_{4,5,6}) -- cgit v1.2.3