From 9303f07dc622399cbeb76baa8c9e2c9cd53c8b3f Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sun, 9 Sep 2018 13:16:50 +0200 Subject: Version bumps. Remove dev-util/ccache --- app-shells/schily-tools/Manifest | 2 +- .../schily-tools/schily-tools-2018.08.24.ebuild | 491 -------------------- .../schily-tools/schily-tools-2018.09.04.ebuild | 492 +++++++++++++++++++++ dev-util/ccache/Manifest | 1 - dev-util/ccache/ccache-3.4.2.ebuild | 61 --- dev-util/ccache/metadata.xml | 17 - metadata/pkg_desc_index | 5 +- x11-libs/gtk+/Manifest | 2 +- x11-libs/gtk+/gtk+-3.22.30-r1.ebuild | 235 ---------- x11-libs/gtk+/gtk+-3.24.0.ebuild | 237 ++++++++++ 10 files changed, 733 insertions(+), 810 deletions(-) delete mode 100644 app-shells/schily-tools/schily-tools-2018.08.24.ebuild create mode 100644 app-shells/schily-tools/schily-tools-2018.09.04.ebuild delete mode 100644 dev-util/ccache/Manifest delete mode 100644 dev-util/ccache/ccache-3.4.2.ebuild delete mode 100644 dev-util/ccache/metadata.xml delete mode 100644 x11-libs/gtk+/gtk+-3.22.30-r1.ebuild create mode 100644 x11-libs/gtk+/gtk+-3.24.0.ebuild diff --git a/app-shells/schily-tools/Manifest b/app-shells/schily-tools/Manifest index 28c62248..9ad2918d 100644 --- a/app-shells/schily-tools/Manifest +++ b/app-shells/schily-tools/Manifest @@ -1 +1 @@ -DIST schily-2018-08-24.tar.bz2 4289504 SHA512 0052cac93192011dfd36ef9516bdac7a52f8f93024ebe666b548484f51081224c76993b8fd36ae5ae529911a0126a33737d0e3468a44e686b3d1e6c98428fd76 +DIST schily-2018-09-04.tar.bz2 4294348 SHA512 c0a8f638c31534589cb3ca3e98ca611639ad817bb4ce7147d06c5c946f16b087073d6df28d0c6f8e24ff2a87c92e88e83a9b01620e6fa7bf1303804ca1c25a97 diff --git a/app-shells/schily-tools/schily-tools-2018.08.24.ebuild b/app-shells/schily-tools/schily-tools-2018.08.24.ebuild deleted file mode 100644 index e8ded570..00000000 --- a/app-shells/schily-tools/schily-tools-2018.08.24.ebuild +++ /dev/null @@ -1,491 +0,0 @@ -# Copyright 2016-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -RESTRICT="mirror" -inherit fcaps flag-o-matic gnuconfig required-use-warn toolchain-funcs - -MY_PV=${PV//./-} -MY_P="schily-${MY_PV}" -MY_P_TAR="${MY_P}.tar.bz2" -S=${WORKDIR}/${MY_P} - -SRC_URI="mirror://sourceforge/schilytools/${MY_P}.tar.bz2" -DESCRIPTION="Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell" -HOMEPAGE="https://sourceforge.net/projects/schilytools/" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="acl caps doc nls suid unicode xattr" -REQUIRED_USE_WARN="amd64-fbsd? ( !xattr )" - -PATCHES=("${FILESDIR}"/strlcat-mapvers.patch) - -add_iuse_expand() { - local i j - j=${1} - shift - for i - do case ${i} in - +*) - IUSE=${IUSE}" +${j}_${i#?}";; - *) - IUSE=${IUSE}" ${j}_${i}";; - esac - done -} -add_iuse_expand renameschily \ - +calc +compare +count +jsh +libschily +man2html +p -add_iuse_expand schilytools +bosh +calc +calltree +cdrtools \ - +change +compare +copy +count +cpp +cstyle +cut \ - +hdump label +lndir +man2html manmake +match +mdigest mountcd \ - +obosh +p +paste +patch +pbosh pxupgrade +sccs +sfind +smake +star \ - +termcap +translit +udiff +ved - -COMMON="!!app-cdr/cdrtools[-schily-tools(-)] -!!app-arch/star -!renameschily_libschily? ( !sys-apps/man ) -schilytools_calc? ( - !renameschily_calc? ( !sci-mathematics/calc ) -) -schilytools_compare? ( - !renameschily_compare? ( - !media-gfx/imagemagick !media-gfx/graphicsmagick[imagemagick] - ) -) -schilytools_count? ( - !renameschily_count? ( !sys-devel/llvm ) -) -schilytools_bosh? ( - !renameschily_jsh? ( !app-shells/heirloom-sh ) -) -schilytools_man2html? ( - !renameschily_man2html? ( !sys-apps/man ) -) -schilytools_p? ( - !renameschily_p? ( !dev-util/wiggle ) -) -schilytools_translit? ( !dev-perl/Lingua-Translit ) -acl? ( virtual/acl ) -caps? ( sys-libs/libcap ) -nls? ( virtual/libintl ) -!amd64-fbsd? ( xattr? ( sys-apps/attr ) )" -DEPEND="${COMMON}" -RDEPEND="${COMMON}" -BDEPEND="nls? ( >=sys-devel/gettext-0.18.1.1 )" -LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" -SLOT="0" - -pkg_pretend() { - required-use-warn -} - -# Lot of this code is taken from app-cdr/cdrtools - -FILECAPS=( - cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord -- - cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav -- - cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd -) - -cdrtools_os() { - local os="linux" - [[ ${CHOST} == *-darwin* ]] && os="mac-os10" - [[ ${CHOST} == *-freebsd* ]] && os="freebsd" - echo "${os}" -} - -src_schily_prepare() ( - gnuconfig_update - - # This fixes a clash with clone() on uclibc. Upstream isn't - # going to include this so let's try to carry it forward. - # Contact me if it needs updating. Bug #486782. - # Anthony G. Basile . - use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch - - # Remove profiled make files. - find -name '*_p.mk' -delete || die "delete *_p.mk" - - # Adjusting hardcoded paths. - sed -i -e "s|opt/schily|usr|" \ - $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ - || die "sed opt/schily" - - sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \ - $(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \ - || die "sed doc" - - # Respect libdir. - sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \ - $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/\(siconv\)\?\)\?$' '{}' '+') \ - || die "sed multilib" - - # Respect libdir for defaults.smk - sed -i -e "s|/lib/|/$(get_libdir)/|" \ - smake/Makefile \ - || die "sed multilib for smake" - - # Enable verbose build. - sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \ - RULES/*.rul RULES/rules.prg RULES/rules.inc \ - || die "sed verbose rules" - - # Respect CC/CXX variables. - cd "${S}"/RULES || die - local tcCC=$(tc-getCC) - local tcCXX=$(tc-getCXX) - sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ - rules1.top || die "sed rules1.top" - # -e "s|^\(DEFCCOM_DEF=\).*|\1\t${tcCC}|" \ - sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ - -e "/^CC++_COM_DEF=/s|g[+][+]|${tcCXX}|" \ - -e "/COPTOPT=/s|-O||" \ - -e 's|[$][(]GCCOPTOPT[)]||' \ - -e 's|[$][(]GCC_OPTXX[)]||' \ - cc-gcc.rul || die "sed cc-gcc.rul" - sed -i -e "/^CC_COM_DEF=/s|clang|${tcCC}|" \ - -e "/^CC++_COM_DEF=/s|clang[+][+]|${tcCXX}|" \ - -e "/COPTOPT=/s|-O||" \ - -e 's|[$][(]CLANGOPTXX[)]||' \ - cc-clang.rul || die "sed cc-clang.rul" - sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \ - rules.cnf || die "sed rules.cnf" - - # Schily make setup. - cd "${S}"/DEFAULTS || die - local os=$(cdrtools_os) - - sed -i \ - -e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \ - -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \ - -e "s|^\(LDPATH=\).*|\1|" \ - -e "s|^\(RUNPATH=\).*|\1|" \ - -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \ - -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \ - -e "s|^\(DEFINSGRP=\).*|\1\t0|" \ - -e "s|^\(DEFCCOM=\).*|\1\t${tcCC}|" \ - -e '/^DEFUMASK/s,002,022,g' \ - Defaults.${os} || die "sed Schily make setup" - # re DEFUMASK above: - # bug 486680: grsec TPE will block the exec if the directory is - # group-writable. This is painful with cdrtools, because it makes a bunch of - # group-writable directories during build. Change the umask on their - # creation to prevent this. -) - -targets="" - -targets() { - local i - for i - do case " ${targets} " in - *" ${i} "*) - continue;; - esac - mv -v UNUSED_TARGETS/??"${i}" TARGETS || die - targets=${targets}${targets:+\ }${i} - done -} - -src_prepare() { - filter-flags -fPIE -pie '-flto*' -fwhole-program -fno-common - src_schily_prepare - sed -i -e '1s!man1/sh\.1!man1/bosh.1!' -- "${S}/sh/"{jsh,pfsh}.1 || die - sed -i \ - -e '/-DDO_POSIX_SH/s/^[#]//' \ - -e '/-DDO_POSIX_PATH/s/^/\#/' \ - -e '/[+][=] -DPOSIX_BOSH_PATH/iCPPOPTS += -DPOSIX_BOSH_PATH=\\"'"${EPREFIX}"'/bin/sh\\"' \ - -- "${S}/sh/"Makefile || die - mkdir UNUSED_TARGETS || die - mv TARGETS/[0-9][0-9]* UNUSED_TARGETS || die - targets inc libfind - targets include libschily libmdigest - ! use schilytools_bosh || targets sh libxtermcap libshedit libgetopt - ! use schilytools_calc || targets calc - ! use schilytools_calltree || targets calltree - ! use schilytools_change || targets change - if use schilytools_cdrtools; then - targets btcflash cdda2wav cdrecord mkisofs 'mkisofs!@!diag' \ - libdeflt libscg 'libscg!@!scg' \ - readcd rscsi scgcheck scgskeleton \ - libcdrdeflt libedc libfile libhfs_iso libparanoia \ - librscg libscgcmd libsiconv 'libsiconv!@!tables' - fi -# nonexistent: -# ! use schilytools_cmd || targets cmd - ! use schilytools_compare || targets compare - ! use schilytools_copy || targets copy - ! use schilytools_count || targets count - ! use schilytools_cpp || targets cpp - ! use schilytools_cstyle || targets cstyle - ! use schilytools_cut || targets cut - ! use schilytools_hdump || targets hdump - ! use schilytools_label || targets label - ! use schilytools_lndir || targets lndir - ! use schilytools_man2html || targets man2html - ! use schilytools_manmake || targets man - ! use schilytools_match || targets match - ! use schilytools_mdigest || targets mdigest - ! use schilytools_mountcd || targets mountcd - ! use schilytools_obosh || targets obosh libxtermcap libshedit libgetopt - ! use schilytools_p || targets p libxtermcap - ! use schilytools_paste || targets paste - ! use schilytools_patch || targets patch - ! use schilytools_pbosh || targets pbosh libxtermcap libshedit libgetopt - ! use schilytools_pxupgrade || targets pxupgrade - ! use schilytools_sccs || targets sccs libgetopt - ! use schilytools_sfind || targets sfind - ! use schilytools_smake || targets smake - ! use schilytools_star || targets mt rmt star star_sym tartest librmt - ! use schilytools_termcap || targets termcap libxtermcap - ! use schilytools_translit || targets translit - ! use schilytools_udiff || targets udiff - ! use schilytools_ved || targets ved libxtermcap - default -} - -ac_cv_sizeof() { - cat <<-EOF >"${T}"/test.c - #include - #include - #include - #include - int main () { - static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)]; - test_array [0] = 0; - return test_array [0]; - } - EOF - - local i=1 - while [[ ${i} -lt 20 ]] ; do - if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then - echo ${i} - return 0 - fi - : $(( i += 1 )) - done - return 1 -} - -src_configure() { - use acl || export ac_cv_header_sys_acl_h="no" - use caps || export ac_cv_lib_cap_cap_get_proc="no" - use xattr || export ac_cv_header_attr_xattr_h="no" - export ac_cv_header_pulse_pulseaudio_h="no" - - # skip obsolete configure script - if tc-is-cross-compiler ; then - # Cache known values for targets. #486680 - - tc-export CC - local var val t types=( - char "short int" int "long int" "long long" - "unsigned char" "unsigned short int" "unsigned int" - "unsigned long int" "unsigned long long" - float double "long double" size_t ssize_t ptrdiff_t - mode_t uid_t gid_t pid_t dev_t time_t wchar_t - "char *" "unsigned char *" - ) - for t in "${types[@]}" ; do - var="ac_cv_sizeof_${t// /_}" - var=${var//[*]/p} - val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}" - export "${var}=${val}" - einfo "Computing sizeof(${t}) as ${val}" - done - # We don't have these types. - export ac_cv_sizeof___int64=0 - export ac_cv_sizeof_unsigned___int64=0 - export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t} - export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t} - export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t} - - export ac_cv_type_prototypes="yes" - export ac_cv_func_mlock{,all}="yes" - export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc) - export ac_cv_func_dtoa_r="no" - export ac_cv_func_sys_siglist{,_def}="no" - export ac_cv_func_printf_{j,ll}="yes" - export ac_cv_realloc_null="yes" - export ac_cv_no_user_malloc="no" - export ac_cv_var_timezone="yes" - export ac_cv_var___progname{,_full}="yes" - export ac_cv_fnmatch_igncase="yes" - export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes" - export ac_cv_file__usr_src_linux_include="no" - - case $(cdrtools_os) in - linux) - export ac_cv_func_bsd_{g,s}etpgrp="no" - export ac_cv_hard_symlinks="yes" - export ac_cv_link_nofollow="yes" - export ac_cv_access_e_ok="no" - - export ac_cv_dev_minor_noncontig="yes" - case ${ac_cv_sizeof_long_int} in - 4) export ac_cv_dev_minor_bits="32";; - 8) export ac_cv_dev_minor_bits="44";; - esac - - cat <<-EOF >"${T}"/test.c - struct { - char start[6]; - unsigned char x1:4; - unsigned char x2:4; - char end[5]; - } a = { - .start = {'S', 't', 'A', 'r', 'T', '_'}, - .x1 = 5, - .x2 = 4, - .end = {'_', 'e', 'N', 'd', 'X'}, - }; - EOF - ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o - if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then - export ac_cv_c_bitfields_htol="no" - elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then - export ac_cv_c_bitfields_htol="yes" - fi - ;; - esac - fi -} - -src_compile() { - if use unicode; then - local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)" - if [[ -n ${flags} ]]; then - append-flags ${flags} - else - ewarn "Your compiler does not support the options required to build" - ewarn "cdrtools with unicode in USE. unicode flag will be ignored." - fi - fi - emake CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ - LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" -} - -mustnothave() { - local i - for i; do - test -r "${ED}${i}" && die "${ED}${i} must not exist" - done -} - -mustremove() { - local i - for i; do - test -r "${ED}${i}" && rm -v -- "${ED}${i}" || \ - die "cannot remove ${ED}${i}" - done -} - -removedirs() { - local i - for i; do - ! test -d "${ED}${i}" || rm -rfv -- "${ED}${i}" || \ - die "cannot remove ${ED}${i}" - done -} - -src_install() { - local i - ! use doc || dodoc -r Schily.Copyright README.SSPM PORTING CONTRIBUTING \ - AN-????-??-?? ANNOUNCEMENTS READMEs/README.linux - emake CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ - LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install - find "${ED}" '(' -name '*.a' '-o' -name '*.so' ')' -delete || die - use suid || find "$ED" -perm /4000 -exec chmod -v -- -s '{}' '+' || die - if use schilytools_cdrtools; then - # These symlinks are for compat with cdrkit. - dosym schily /usr/include/scsilib - dosym ../scg /usr/include/schily/scg - - cd "${S}"/cdda2wav || die - docinto cdda2wav - dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO - - cd "${S}"/mkisofs || die - docinto mkisofs - dodoc ChangeLog* TODO - fi - removedirs /usr/include - if use schilytools_star; then - removedirs /usr/share/doc/star || die - mustremove /usr/bin/{gnu,}tar - mv -i "${ED}"/usr/sbin/rmt{,.star} || die - fi - if use schilytools_sccs; then - mv -v "${ED}"/usr/share/man/man1/{,sccs-}diff.1 || die - else - ! test -d "${ED}"/usr/ccs || rm -rfv -- "${ED}"/usr/ccs || die - mustnothave /usr/share/man/man1/diff.1 - fi - if use schilytools_hdump; then - mustremove /usr/bin/od /usr/share/man/man1/od.1 - else - mustnothave /usr/bin/od /usr/share/man/man1/od.1 - fi - if use schilytools_patch; then - mustremove /usr/share/man/man1/patch.1 - else - mustnothave /usr/share/man/man1/patch.1 - fi - if use schilytools_bosh; then - dodir bin || die - rm -v "${ED}"/usr/bin/{bo,j,pf}sh \ - "${ED}"/usr/share/man/man1/bosh.1 || die - rm -rfv "${ED}"/usr/xpg4 || die - mv -v -- "${ED}"/{usr/bin/sh,bin/bosh} || die - ln -s -- bosh "${ED}"/bin/jsh || die - ln -s -- bosh "${ED}"/bin/pfsh || die - mv -v -- "${ED}"/usr/share/man/man1/{,bo}sh.1 || die - if use renameschily_jsh; then - mv -v -- "${ED}"/bin/{,s}jsh || die - mv -v -- "${ED}"/usr/share/man/man1/{,s}jsh.1 || die - fi - fi - if use schilytools_calc && use renameschily_calc; then - mv -v -- "${ED}"/usr/bin/{,s}calc || die - mv -v -- "${ED}"/usr/share/man/man1/{,s}calc.1 || die - fi - if use schilytools_compare && use renameschily_compare; then - mv -v -- "${ED}"/usr/bin/{,s}compare || die - mv -v -- "${ED}"/usr/share/man/man1/{,s}compare.1 || die - fi - if use schilytools_count && use renameschily_count; then - mv -v -- "${ED}"/usr/bin/{,s}count || die - mv -v -- "${ED}"/usr/share/man/man1/{,s}count.1 || die - fi - if use schilytools_man2html && use renameschily_man2html; then - mv -v -- "${ED}"/usr/bin/{,s}man2html || die - mv -v -- "${ED}"/usr/share/man/man1/{,s}man2html.1 || die - fi - if use schilytools_p && use renameschily_p; then - mv -v -- "${ED}"/usr/bin/{,s}p || die - mv -v -- "${ED}"/usr/share/man/man1/{,s}p.1 || die - fi - if use schilytools_ved; then - docompress -x /usr/share/man/help - fi - if use renameschily_libschily; then - for i in error fexecve fnmatch getline {,f,s}printf strlen - do mv -v -- "${ED}"/usr/share/man/man3/{,schily-}${i}.3 || die - done - fi -} - -pkg_postinst() { - use schilytools_cdrtools || return 0 - fcaps_pkg_postinst - - if [[ ${CHOST} == *-darwin* ]] ; then - einfo - einfo "Darwin/OS X use the following device names:" - einfo - einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices" - einfo - einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices" - einfo - fi -} diff --git a/app-shells/schily-tools/schily-tools-2018.09.04.ebuild b/app-shells/schily-tools/schily-tools-2018.09.04.ebuild new file mode 100644 index 00000000..937edc36 --- /dev/null +++ b/app-shells/schily-tools/schily-tools-2018.09.04.ebuild @@ -0,0 +1,492 @@ +# Copyright 2016-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +RESTRICT="mirror" +inherit fcaps flag-o-matic gnuconfig required-use-warn toolchain-funcs + +MY_PV=${PV//./-} +MY_P="schily-${MY_PV}" +MY_P_TAR="${MY_P}.tar.bz2" +S=${WORKDIR}/${MY_P} + +SRC_URI="mirror://sourceforge/schilytools/${MY_P}.tar.bz2" +DESCRIPTION="Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell" +HOMEPAGE="https://sourceforge.net/projects/schilytools/" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="acl caps doc nls suid unicode xattr" +REQUIRED_USE_WARN="amd64-fbsd? ( !xattr )" + +PATCHES=("${FILESDIR}"/strlcat-mapvers.patch) + +add_iuse_expand() { + local i j + j=${1} + shift + for i + do case ${i} in + +*) + IUSE=${IUSE}" +${j}_${i#?}";; + *) + IUSE=${IUSE}" ${j}_${i}";; + esac + done +} +add_iuse_expand renameschily \ + +calc +compare +count +jsh +libschily +man2html +p +add_iuse_expand schilytools +bosh +calc +calltree +cdrtools \ + +change +compare +copy +count +cpp +cstyle +cut \ + +hdump label +lndir +man2html manmake +match +mdigest mountcd \ + +obosh +p +paste +patch +pbosh pxupgrade +sccs +sfind +smake +star \ + +termcap +translit +udiff +ved + +COMMON="!!app-cdr/cdrtools[-schily-tools(-)] +!!app-arch/star +!renameschily_libschily? ( !sys-apps/man ) +schilytools_calc? ( + !renameschily_calc? ( !sci-mathematics/calc ) +) +schilytools_compare? ( + !renameschily_compare? ( + !media-gfx/imagemagick !media-gfx/graphicsmagick[imagemagick] + ) +) +schilytools_count? ( + !renameschily_count? ( !sys-devel/llvm ) +) +schilytools_bosh? ( + !renameschily_jsh? ( !app-shells/heirloom-sh ) +) +schilytools_man2html? ( + !renameschily_man2html? ( !sys-apps/man ) +) +schilytools_p? ( + !renameschily_p? ( !dev-util/wiggle ) +) +schilytools_translit? ( !dev-perl/Lingua-Translit ) +acl? ( virtual/acl ) +caps? ( sys-libs/libcap ) +nls? ( virtual/libintl ) +!amd64-fbsd? ( xattr? ( sys-apps/attr ) )" +DEPEND="${COMMON}" +RDEPEND="${COMMON}" +BDEPEND="nls? ( >=sys-devel/gettext-0.18.1.1 )" +LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" +SLOT="0" + +pkg_pretend() { + required-use-warn +} + +# Lot of this code is taken from app-cdr/cdrtools + +FILECAPS=( + cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord -- + cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav -- + cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd +) + +cdrtools_os() { + local os="linux" + [[ ${CHOST} == *-darwin* ]] && os="mac-os10" + [[ ${CHOST} == *-freebsd* ]] && os="freebsd" + echo "${os}" +} + +src_schily_prepare() ( + gnuconfig_update + + # This fixes a clash with clone() on uclibc. Upstream isn't + # going to include this so let's try to carry it forward. + # Contact me if it needs updating. Bug #486782. + # Anthony G. Basile . + use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch + + # Remove profiled make files. + find -name '*_p.mk' -delete || die "delete *_p.mk" + + # Adjusting hardcoded paths. + sed -i -e "s|opt/schily|usr|" \ + $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ + || die "sed opt/schily" + + sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \ + $(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \ + || die "sed doc" + + # Respect libdir. + sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \ + $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/\(siconv\)\?\)\?$' '{}' '+') \ + || die "sed multilib" + + # Respect libdir for defaults.smk + sed -i -e "s|/lib/|/$(get_libdir)/|" \ + smake/Makefile \ + || die "sed multilib for smake" + + # Enable verbose build. + sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \ + RULES/*.rul RULES/rules.prg RULES/rules.inc \ + || die "sed verbose rules" + + # Respect CC/CXX variables. + cd "${S}"/RULES || die + local tcCC=$(tc-getCC) + local tcCXX=$(tc-getCXX) + sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ + rules1.top || die "sed rules1.top" + # -e "s|^\(DEFCCOM_DEF=\).*|\1\t${tcCC}|" \ + sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ + -e "/^CC++_COM_DEF=/s|g[+][+]|${tcCXX}|" \ + -e "/COPTOPT=/s|-O||" \ + -e 's|[$][(]GCCOPTOPT[)]||' \ + -e 's|[$][(]GCC_OPTXX[)]||' \ + cc-gcc.rul || die "sed cc-gcc.rul" + sed -i -e "/^CC_COM_DEF=/s|clang|${tcCC}|" \ + -e "/^CC++_COM_DEF=/s|clang[+][+]|${tcCXX}|" \ + -e "/COPTOPT=/s|-O||" \ + -e 's|[$][(]CLANGOPTXX[)]||' \ + cc-clang.rul || die "sed cc-clang.rul" + sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \ + rules.cnf || die "sed rules.cnf" + + # Schily make setup. + cd "${S}"/DEFAULTS || die + local os=$(cdrtools_os) + + sed -i \ + -e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \ + -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \ + -e "s|^\(LDPATH=\).*|\1|" \ + -e "s|^\(RUNPATH=\).*|\1|" \ + -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \ + -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \ + -e "s|^\(DEFINSGRP=\).*|\1\t0|" \ + -e "s|^\(DEFCCOM=\).*|\1\t${tcCC}|" \ + -e '/^DEFUMASK/s,002,022,g' \ + Defaults.${os} || die "sed Schily make setup" + # re DEFUMASK above: + # bug 486680: grsec TPE will block the exec if the directory is + # group-writable. This is painful with cdrtools, because it makes a bunch of + # group-writable directories during build. Change the umask on their + # creation to prevent this. +) + +targets="" + +targets() { + local i + for i + do case " ${targets} " in + *" ${i} "*) + continue;; + esac + mv -v UNUSED_TARGETS/??"${i}" TARGETS || die + targets=${targets}${targets:+\ }${i} + done +} + +src_prepare() { + filter-flags -fPIE -pie '-flto*' -fwhole-program -fno-common + src_schily_prepare + sed -i -e '1s!man1/sh\.1!man1/bosh.1!' -- "${S}/sh/"{jsh,pfsh}.1 || die + sed -i \ + -e '/-DDO_POSIX_SH/s/^[#]//' \ + -e '/-DDO_POSIX_PATH/s/^/\#/' \ + -e '/[+][=] -DPOSIX_BOSH_PATH/iCPPOPTS += -DPOSIX_BOSH_PATH=\\"'"${EPREFIX}"'/bin/sh\\"' \ + -- "${S}/sh/"Makefile || die + mkdir UNUSED_TARGETS || die + mv TARGETS/[0-9][0-9]* UNUSED_TARGETS || die + targets inc libfind + targets include libschily libmdigest + ! use schilytools_bosh || targets sh libxtermcap libshedit libgetopt + ! use schilytools_calc || targets calc + ! use schilytools_calltree || targets calltree + ! use schilytools_change || targets change + if use schilytools_cdrtools; then + targets btcflash cdda2wav cdrecord mkisofs 'mkisofs!@!diag' \ + libdeflt libscg 'libscg!@!scg' \ + readcd rscsi scgcheck scgskeleton \ + libcdrdeflt libedc libfile libhfs_iso libparanoia \ + librscg libscgcmd libsiconv 'libsiconv!@!tables' + fi +# nonexistent: +# ! use schilytools_cmd || targets cmd + ! use schilytools_compare || targets compare + ! use schilytools_copy || targets copy + ! use schilytools_count || targets count + ! use schilytools_cpp || targets cpp + ! use schilytools_cstyle || targets cstyle + ! use schilytools_cut || targets cut + ! use schilytools_hdump || targets hdump + ! use schilytools_label || targets label + ! use schilytools_lndir || targets lndir + ! use schilytools_man2html || targets man2html + ! use schilytools_manmake || targets man + ! use schilytools_match || targets match + ! use schilytools_mdigest || targets mdigest + ! use schilytools_mountcd || targets mountcd + ! use schilytools_obosh || targets obosh libxtermcap libshedit libgetopt + ! use schilytools_p || targets p libxtermcap + ! use schilytools_paste || targets paste + ! use schilytools_patch || targets patch + ! use schilytools_pbosh || targets pbosh libxtermcap libshedit libgetopt + ! use schilytools_pxupgrade || targets pxupgrade + ! use schilytools_sccs || targets sccs libgetopt + ! use schilytools_sfind || targets sfind + ! use schilytools_smake || targets smake + ! use schilytools_star || targets mt rmt star star_sym tartest librmt + ! use schilytools_termcap || targets termcap libxtermcap + ! use schilytools_translit || targets translit + ! use schilytools_udiff || targets udiff + ! use schilytools_ved || targets ved libxtermcap + default +} + +ac_cv_sizeof() { + cat <<-EOF >"${T}"/test.c + #include + #include + #include + #include + int main () { + static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)]; + test_array [0] = 0; + return test_array [0]; + } + EOF + + local i=1 + while [[ ${i} -lt 20 ]] ; do + if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then + echo ${i} + return 0 + fi + : $(( i += 1 )) + done + return 1 +} + +src_configure() { + use acl || export ac_cv_header_sys_acl_h="no" + use caps || export ac_cv_lib_cap_cap_get_proc="no" + use xattr || export ac_cv_header_attr_xattr_h="no" + export ac_cv_header_pulse_pulseaudio_h="no" + + # skip obsolete configure script + if tc-is-cross-compiler ; then + # Cache known values for targets. #486680 + + tc-export CC + local var val t types=( + char "short int" int "long int" "long long" + "unsigned char" "unsigned short int" "unsigned int" + "unsigned long int" "unsigned long long" + float double "long double" size_t ssize_t ptrdiff_t + mode_t uid_t gid_t pid_t dev_t time_t wchar_t + "char *" "unsigned char *" + ) + for t in "${types[@]}" ; do + var="ac_cv_sizeof_${t// /_}" + var=${var//[*]/p} + val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}" + export "${var}=${val}" + einfo "Computing sizeof(${t}) as ${val}" + done + # We don't have these types. + export ac_cv_sizeof___int64=0 + export ac_cv_sizeof_unsigned___int64=0 + export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t} + export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t} + export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t} + + export ac_cv_type_prototypes="yes" + export ac_cv_func_mlock{,all}="yes" + export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc) + export ac_cv_func_dtoa_r="no" + export ac_cv_func_sys_siglist{,_def}="no" + export ac_cv_func_printf_{j,ll}="yes" + export ac_cv_realloc_null="yes" + export ac_cv_no_user_malloc="no" + export ac_cv_var_timezone="yes" + export ac_cv_var___progname{,_full}="yes" + export ac_cv_fnmatch_igncase="yes" + export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes" + export ac_cv_file__usr_src_linux_include="no" + + case $(cdrtools_os) in + linux) + export ac_cv_func_bsd_{g,s}etpgrp="no" + export ac_cv_hard_symlinks="yes" + export ac_cv_link_nofollow="yes" + export ac_cv_access_e_ok="no" + + export ac_cv_dev_minor_noncontig="yes" + case ${ac_cv_sizeof_long_int} in + 4) export ac_cv_dev_minor_bits="32";; + 8) export ac_cv_dev_minor_bits="44";; + esac + + cat <<-EOF >"${T}"/test.c + struct { + char start[6]; + unsigned char x1:4; + unsigned char x2:4; + char end[5]; + } a = { + .start = {'S', 't', 'A', 'r', 'T', '_'}, + .x1 = 5, + .x2 = 4, + .end = {'_', 'e', 'N', 'd', 'X'}, + }; + EOF + ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o + if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then + export ac_cv_c_bitfields_htol="no" + elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then + export ac_cv_c_bitfields_htol="yes" + fi + ;; + esac + fi +} + +src_compile() { + if use unicode; then + local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)" + if [[ -n ${flags} ]]; then + append-flags ${flags} + else + ewarn "Your compiler does not support the options required to build" + ewarn "cdrtools with unicode in USE. unicode flag will be ignored." + fi + fi + append-flags -I"${S}"/libschily + emake CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ + LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" +} + +mustnothave() { + local i + for i; do + test -r "${ED}${i}" && die "${ED}${i} must not exist" + done +} + +mustremove() { + local i + for i; do + test -r "${ED}${i}" && rm -v -- "${ED}${i}" || \ + die "cannot remove ${ED}${i}" + done +} + +removedirs() { + local i + for i; do + ! test -d "${ED}${i}" || rm -rfv -- "${ED}${i}" || \ + die "cannot remove ${ED}${i}" + done +} + +src_install() { + local i + ! use doc || dodoc -r Schily.Copyright README.SSPM PORTING CONTRIBUTING \ + AN-????-??-?? ANNOUNCEMENTS READMEs/README.linux + emake CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ + LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install + find "${ED}" '(' -name '*.a' '-o' -name '*.so' ')' -delete || die + use suid || find "$ED" -perm /4000 -exec chmod -v -- -s '{}' '+' || die + if use schilytools_cdrtools; then + # These symlinks are for compat with cdrkit. + dosym schily /usr/include/scsilib + dosym ../scg /usr/include/schily/scg + + cd "${S}"/cdda2wav || die + docinto cdda2wav + dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO + + cd "${S}"/mkisofs || die + docinto mkisofs + dodoc ChangeLog* TODO + fi + removedirs /usr/include + if use schilytools_star; then + removedirs /usr/share/doc/star || die + mustremove /usr/bin/{gnu,}tar + mv -i "${ED}"/usr/sbin/rmt{,.star} || die + fi + if use schilytools_sccs; then + mv -v "${ED}"/usr/share/man/man1/{,sccs-}diff.1 || die + else + ! test -d "${ED}"/usr/ccs || rm -rfv -- "${ED}"/usr/ccs || die + mustnothave /usr/share/man/man1/diff.1 + fi + if use schilytools_hdump; then + mustremove /usr/bin/od /usr/share/man/man1/od.1 + else + mustnothave /usr/bin/od /usr/share/man/man1/od.1 + fi + if use schilytools_patch; then + mustremove /usr/share/man/man1/patch.1 + else + mustnothave /usr/share/man/man1/patch.1 + fi + if use schilytools_bosh; then + dodir bin || die + rm -v "${ED}"/usr/bin/{bo,j,pf}sh \ + "${ED}"/usr/share/man/man1/bosh.1 || die + rm -rfv "${ED}"/usr/xpg4 || die + mv -v -- "${ED}"/{usr/bin/sh,bin/bosh} || die + ln -s -- bosh "${ED}"/bin/jsh || die + ln -s -- bosh "${ED}"/bin/pfsh || die + mv -v -- "${ED}"/usr/share/man/man1/{,bo}sh.1 || die + if use renameschily_jsh; then + mv -v -- "${ED}"/bin/{,s}jsh || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}jsh.1 || die + fi + fi + if use schilytools_calc && use renameschily_calc; then + mv -v -- "${ED}"/usr/bin/{,s}calc || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}calc.1 || die + fi + if use schilytools_compare && use renameschily_compare; then + mv -v -- "${ED}"/usr/bin/{,s}compare || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}compare.1 || die + fi + if use schilytools_count && use renameschily_count; then + mv -v -- "${ED}"/usr/bin/{,s}count || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}count.1 || die + fi + if use schilytools_man2html && use renameschily_man2html; then + mv -v -- "${ED}"/usr/bin/{,s}man2html || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}man2html.1 || die + fi + if use schilytools_p && use renameschily_p; then + mv -v -- "${ED}"/usr/bin/{,s}p || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}p.1 || die + fi + if use schilytools_ved; then + docompress -x /usr/share/man/help + fi + if use renameschily_libschily; then + for i in error fexecve fnmatch getline {,f,s}printf strlen + do mv -v -- "${ED}"/usr/share/man/man3/{,schily-}${i}.3 || die + done + fi +} + +pkg_postinst() { + use schilytools_cdrtools || return 0 + fcaps_pkg_postinst + + if [[ ${CHOST} == *-darwin* ]] ; then + einfo + einfo "Darwin/OS X use the following device names:" + einfo + einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices" + einfo + einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices" + einfo + fi +} diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest deleted file mode 100644 index 4ea63905..00000000 --- a/dev-util/ccache/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ccache-3.4.2.tar.xz 324340 SHA512 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e diff --git a/dev-util/ccache/ccache-3.4.2.ebuild b/dev-util/ccache/ccache-3.4.2.ebuild deleted file mode 100644 index 41543471..00000000 --- a/dev-util/ccache/ccache-3.4.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 - -DESCRIPTION="fast compiler cache" -HOMEPAGE="https://ccache.samba.org/" -SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd" -IUSE="" - -DEPEND="app-arch/xz-utils - sys-libs/zlib" -RDEPEND="${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions" - -src_prepare() { - # make sure we always use system zlib - rm -rf zlib || die - default -} - -src_install() { - default - - insinto /usr/share/shadowman/tools - newins - ccache <<<'/usr/lib/ccache/bin' - - DOC_CONTENTS=" -To use ccache with **non-Portage** C compiling, add -${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin. -Portage 2.0.46-r11+ will automatically take advantage of ccache with -no additional steps. If this is your first install of ccache, type -something like this to set a maximum cache size of 2GB:\\n -# ccache -M 2G\\n -If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n -# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n -ccache now supports sys-devel/clang and dev-lang/icc, too!" - - readme.gentoo_create_doc -} - -pkg_prerm() { - [ -n "${REPLACED_BY_VERSION}${ROOT}" ] || \ - eselect compiler-shadow remove ccache -} - -pkg_postinst() { - [ -n "${ROOT}" ] || eselect compiler-shadow update ccache - - # nuke broken symlinks from previous versions that shouldn't exist - rm -rf "${EROOT}"/usr/lib/ccache.backup || die - - readme.gentoo_print_elog -} diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml deleted file mode 100644 index 22e50c8e..00000000 --- a/dev-util/ccache/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - martin@mvath.de - Martin Väth - maintainer of the updates in the mv overlay - - - toolchain@gentoo.org - Gentoo Toolchain Project - - - ccache acts as a caching pre-processor to C/C++ compilers, improving - compilation time when recompiling previously compiled source. - - diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index f7bb6456..38e338cd 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -41,7 +41,7 @@ app-shells/oh-my-zsh 99999999: A ready-to-use zsh configuration with plugins app-shells/push 3.1-r1: A POSIX shell function to treat a variable like an array, quoting args app-shells/quoter 4.1-r1: Quote arguments or standard input for usage in POSIX shell by eval app-shells/runtitle 2.10: Scripts to run commands and set the hard status line (windows title) -app-shells/schily-tools 2018.08.24: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell +app-shells/schily-tools 2018.09.04: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell app-shells/set_prompt 3.1: An intelligent prompt for zsh or bash with status line (window title) support app-shells/termcolors-mv 4.7-r1: 256colors sample script and dircolors configuration for standard or 256 colors app-shells/zsh-autosuggestions 0.4.3 0.4.4_alpha20180717 99999999: Fish-like autosuggestions for zsh @@ -58,7 +58,6 @@ dev-libs/osformat 1.0.5 999999999: C++ library for a typesafe printf/sprintf bas dev-libs/weston 3.0.0: Wayland reference compositor dev-perl/File-lchown 0.20-r1: Use the lchown(2) and lutimes(2) system call from Perl dev-tex/chklref 2.6.0 2.6.1_alpha20170913: Finds useless references in latex files or unnecessarily numbered environments -dev-util/ccache 3.4.2: fast compiler cache dev-util/comp 4.3: compare files or directories, including metadata dev-util/diffhelp 1.11: A frontend, beautifier, and path-fixer for diff -u dev-util/mv_perl 3.16: A collection of perl scripts (replacement in files, syncing dirs etc) @@ -133,6 +132,6 @@ www-plugins/open-in-google-translate 0.1.3: Firefox webextension: open selected www-plugins/skip-redirect 2.2.1: Firefox webextension: skip intermediary pages before redirecting www-plugins/translate-to-me 1.1: Firefox webextension: translate the selected text with www.linguee.com www-plugins/ublock-origin 1.16.16: Firefox webextension: An efficient list-based blocker -x11-libs/gtk+ 2.24.32-r1 3.22.30-r1: Gimp ToolKit + +x11-libs/gtk+ 2.24.32-r1 3.24.0: Gimp ToolKit + x11-libs/motif 2.3.8-r1: The Motif user interface component toolkit x11-wm/fvwm 2.6.8: An extremely powerful ICCCM-compliant multiple virtual desktop window manager diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 5f78cca4..78767c65 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,3 @@ DIST gtk+-2.24.32-patchset.tar.xz 6392 SHA512 6c8763826b479c9c122bb991ae42b0ce0e754d460be5c6ea8d1bba28f7318c014822eccaae0b39c3b7c16804991c8c46c53cd8ded3ad6212830a2f5746567543 DIST gtk+-2.24.32.tar.xz 12620860 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 -DIST gtk+-3.22.30.tar.xz 18946084 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38 +DIST gtk+-3.24.0.tar.xz 19273044 SHA512 c82228f31a422d7f180b1157de697d941f2826f9a85a44d2a583564130626c88759a62269bb01f54969e00ff7499db4e1b026dbfb060dda1b6e62f36f3267981 diff --git a/x11-libs/gtk+/gtk+-3.22.30-r1.ebuild b/x11-libs/gtk+/gtk+-3.22.30-r1.ebuild deleted file mode 100644 index 64344e68..00000000 --- a/x11-libs/gtk+/gtk+-3.22.30-r1.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/" -SRC_URI=${SRC_URI} - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="adwaita-icon-theme aqua atk-bridge broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 -RESTRICT="test" - -# FIXME: introspection data is built against system installation of gtk+:3, -# bug #???? -COMMON_DEPEND=" - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - - cloudprint? ( - >=net-libs/rest-0.7[${MULTILIB_USEDEP}] - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - wayland? ( - >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.12 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] ) - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.48 - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( x11-base/xorg-proto ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !