From e615f54194a10dd77603e5679bb166e4f56e7a62 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Fri, 11 Sep 2009 02:58:06 +1200 Subject: Added Live/Blead of perl. Broken, do not use. (Portage version: 2.2_rc40/git/Linux x86_64) (Signed Manifest commit) --- dev-lang/perl/ChangeLog | 122 ++++++++ dev-lang/perl/perl-9999.ebuild | 650 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 772 insertions(+) create mode 100644 dev-lang/perl/ChangeLog create mode 100644 dev-lang/perl/perl-9999.ebuild diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog new file mode 100644 index 000000000..409036909 --- /dev/null +++ b/dev-lang/perl/ChangeLog @@ -0,0 +1,122 @@ +# ChangeLog for dev-lang/perl +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 01 Sep 2010; Torsten Veller perl-5.12.2_rc1.ebuild: + Fix Module-CoreList version + +*perl-5.12.2_rc1 (31 Aug 2010) + + 31 Aug 2010; Torsten Veller -perl-5.12.1.ebuild, + +perl-5.12.2_rc1.ebuild: + Add perl-5.12.2-RC1 + + 19 Jun 2010; Torsten Veller -perl-5.12.0.ebuild, + perl-5.12.1.ebuild: + Sync with gentoo + + 18 Jun 2010; Torsten Veller perl-5.12.1.ebuild: + Mainly fix MINIMAL_PERL_INSTALL pathes + + 17 Jun 2010; Torsten Veller perl-5.12.1.ebuild: + Create perl header files (*.ph) for a small number of headers in + pkg_postinst (#292985) + + 16 Jun 2010; Torsten Veller perl-5.12.1.ebuild: + Bump patchset: ExtUtils::MakeMaker does not install .packlist or + perllocal.pod for perl or vendor + + 17 May 2010; Torsten Veller perl-5.12.1.ebuild: + Add Gentoo patches to patchlevel.h + +*perl-5.12.1 (17 May 2010) + + 17 May 2010; Torsten Veller +perl-5.12.1.ebuild: + Version bump + +*perl-5.12.0 (13 Apr 2010) + + 13 Apr 2010; Torsten Veller -perl-5.12.0_rc5.ebuild, + +perl-5.12.0.ebuild: + Bump + +*perl-5.12.0_rc5 (10 Apr 2010) + + 10 Apr 2010; Torsten Veller -perl-5.12.0_rc4.ebuild, + +perl-5.12.0_rc5.ebuild: + Bump + +*perl-5.12.0_rc4 (07 Apr 2010) + + 07 Apr 2010; Torsten Veller -perl-5.12.0_rc3.ebuild, + +perl-5.12.0_rc4.ebuild: + Bump + +*perl-5.12.0_rc3 (04 Apr 2010) + + 04 Apr 2010; Torsten Veller -perl-5.12.0_rc2.ebuild, + +perl-5.12.0_rc3.ebuild: + Bmp + +*perl-5.12.0_rc2 (02 Apr 2010) + + 02 Apr 2010; Torsten Veller -perl-5.12.0_rc1.ebuild, + +perl-5.12.0_rc2.ebuild: + Bump + +*perl-5.12.0_rc1 (30 Mar 2010) + + 30 Mar 2010; Torsten Veller +perl-5.12.0_rc1.ebuild, + +metadata.xml: + First test version. Might be broken. New perl-5.12.0 bugs should block bug + #312061 + +*perl-9999 (10 Sep 2009) + + 10 Sep 2009; Kent Fredric +perl-9999.ebuild: + Added perl blead. Its kinda broken though, for some reason lib/ doesn't + install. + + 06 Sep 2009; Kent Fredric metadata.xml: + IUSE unused metadata + + 25 Aug 2009; Torsten Veller perl-5.10.1-r11.ebuild: + Use system libbz2 and libz + + 25 Aug 2009; Torsten Veller -perl-5.8.8-r10.ebuild, + -perl-5.10.0.ebuild, -perl-5.10.0-r1.ebuild, -perl-5.10.0-r2.ebuild, + -perl-5.10.0-r10.ebuild: + Cleanup + + 25 Aug 2009; Torsten Veller perl-5.10.1-r11.ebuild: + Update patchset + +*perl-5.10.1-r11 (24 Aug 2009) + + 24 Aug 2009; Torsten Veller -perl-5.10.1_rc1-r11.ebuild, + -perl-5.10.1_rc2-r11.ebuild, +perl-5.10.1-r11.ebuild: + Add perl-5.10.1. Remove RCs + +*perl-5.10.1_rc2-r11 (19 Aug 2009) + + 19 Aug 2009; Torsten Veller perl-5.10.1_rc1-r11.ebuild, + +perl-5.10.1_rc2-r11.ebuild: + Add perl-5.10.1_rc2 + +*perl-5.10.1_rc1-r10 (08 Aug 2009) + + 08 Aug 2009; Torsten Veller +perl-5.10.1_rc1-r10.ebuild: + Bump + +*perl-5.10.0-r2 (23 May 2009) + + 23 May 2009; Torsten Veller +perl-5.10.0-r2.ebuild: + Add new dual life module (ExtUtils-MakeMaker). + + 30 Mar 2009; kentfredric@gmail.com +metadata.xml: + Fixing up the copyrights, metadata and USE controls for QA purposes + + 04 Mar 2009; Torsten Veller +perl-5.10.0-r1.ebuild: + Add new dual life modules (CPAN, CPANPLUS, Encode) to see how ugly it + gets. You have to install perl before the new modules to avoid collisions + diff --git a/dev-lang/perl/perl-9999.ebuild b/dev-lang/perl/perl-9999.ebuild new file mode 100644 index 000000000..4f31211e0 --- /dev/null +++ b/dev-lang/perl/perl-9999.ebuild @@ -0,0 +1,650 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 +EGIT_REPO_URI='git://perl5.git.perl.org/perl.git' +EGIT_BRANCH='blead' +inherit eutils alternatives flag-o-matic toolchain-funcs multilib git + +PATCH_VER=5 + +PERL_OLDVERSEN="5.10.1" +PERL_VER="5.11.0" + +SHORT_PV="${PV%.*}" +MY_P="perl-${PV/_rc/-RC}" +MY_PV="${PV%_rc*}" + +DESCRIPTION="Larry Wall's Practical Extraction and Report Language" + +#S="${WORKDIR}/${MY_P}" +#SRC_URI="mirror://cpan/src/${MY_P}.tar.bz2 +# http://dev.gentoo.org/~tove/files/${MY_P}-${PATCH_VER}.tar.bz2" +HOMEPAGE="http://www.perl.org/" + +LICENSE="|| ( Artistic GPL-2 )" +SLOT="blead" +KEYWORDS="" +#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="berkdb build debug doc gdbm ithreads" + +COMMON_DEPEND="berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.3 ) + app-arch/bzip2 + sys-libs/zlib" +DEPEND="${COMMON_DEPEND} + elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )" +RDEPEND="${COMMON_DEPEND} + ! 2003.06.26 + use mips && myconf -Dd_u32align + + use sparc && myconf -Ud_longdbl + + export LC_ALL="C" + + # 266337 + export BUILD_BZIP2=0 + export BZIP2_INCLUDE=/usr/include + export BZIP2_LIB=/usr/$(get_libdir) + cat <<-EOF > "${S}/ext/Compress-Raw-Zlib/config.in" + BUILD_ZLIB = False + INCLUDE = /usr/include + LIB = /usr/{get_libdir} + + OLD_ZLIB = False + GZIP_OS_CODE = AUTO_DETECT + EOF + + export OTHERLDFLAGS="${LDFLAGS}" + + case ${CHOST} in + *-freebsd*) osname="freebsd" ;; + *-dragonfly*) osname="dragonfly" ;; + *-netbsd*) osname="netbsd" ;; + *-openbsd*) osname="openbsd" ;; + *-darwin*) osname="darwin" ;; + *) osname="linux" ;; + esac + + if use ithreads ; then + mythreading="-multi" + myconf -Dusethreads + myarch=${CHOST} + myarch="${myarch%%-*}-${osname}-thread" + else + myarch=${CHOST} + myarch="${myarch%%-*}-${osname}" + fi + if use debug ; then + myarch="${myarch}-debug" + fi + myarch="${myarch}-dev" + + # allow either gdbm to provide ndbm (in ) or db1 + + myndbm='U' + mygdbm='U' + mydb='U' + + if use gdbm ; then + mygdbm='D' + myndbm='D' + fi + if use berkdb ; then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db" + + if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf -Ui_db -Ui_ndbm + fi + + if use debug ; then + append-cflags "-g" + myconf -DDEBUGGING + fi + + local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v} ${v}/${myarch}${mythreading}"; done ) + [[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)" + + [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" + + if [[ $(get_libdir) != "lib" ]] ; then + # We need to use " and not ', as the written config.sh use ' ... + myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)" + fi + + sh Configure \ + -des \ + -Duseshrplib \ + -Darchname="${myarch}" \ + -Dcc="$(tc-getCC)" \ + -Doptimize="${CFLAGS}" \ + -Dscriptdir=/usr/bin \ + -Dprefix='/usr' \ + -Dvendorprefix='/usr' \ + -Dsiteprefix='/usr' \ + -Dprivlib="/usr/$(get_libdir)/perl5/${MY_PV}" \ + -Darchlib="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}" \ + -Dvendorlib="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}" \ + -Dvendorarch="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}" \ + -Dsitelib="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}" \ + -Dsitearch="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}" \ + -Dlibperl="${LIBPERL}" \ + -Dlocincpth=' ' \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dinc_version_list="$inclist" \ + -Dcf_by='Gentoo' \ + -Dmyhostname='localhost' \ + -Dperladmin='root@localhost' \ + -Dinstallusrbinperl='n' \ + -Ud_csh \ + -Uusenm \ + -Dusedevel \ + "${myconf[@]}" || die "Unable to configure" +} + +src_test() { +# use elibc_uclibc && export MAKEOPTS="${MAKEOPTS} -j1" + TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \ + make -j1 test_harness || die "test failed" +} + +src_install() { + export LC_ALL="C" + local i + local coredir="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}/CORE" + + # Fix for "stupid" modules and programs + dodir /usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading} + + local installtarget=install + if use build ; then + installtarget=install.perl + fi + make DESTDIR="${D}" ${installtarget} || die "Unable to make + ${installtarget}"› + + rm "${D}"/usr/bin/perl + #ln -s perl${PERL_VER} "${D}"/usr/bin/perl + + dolib.so "${D}"/${coredir}/${LIBPERL} || die + einfo dolib.so "${D}"/${coredir}/${LIBPERL} + +# dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die +# einfo dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) + +# dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die +# einfo dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die + + rm "${D}"/${coredir}/${LIBPERL} + einfo rm "${D}"/${coredir}/${LIBPERL} + + dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL} + einfo dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL} + + dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV}) + einfo dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV}) + + dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname) + einfo dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname) + + rm -rf "${D}"/usr/share/man/man1 || die "Unable to remove module man pages" + rm -rf "${D}"/usr/share/man/man3 || die "Unable to remove module man pages" +# cp -f utils/h2ph utils/h2ph_patched +# epatch "${FILESDIR}"/${PN}-h2ph-ansi-header.patch +# +# LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \ +# -a -d "${D}"/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading} < /dev/null + fi + done + ebegin "Generating ConfigLocal.pm (ignore any error)" + enc2xs -C + ebegin "Converting C header files to the corresponding Perl format" + cd /usr/include + h2ph -Q * + h2ph -Q -r sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* + fi + +# This has been moved into a function because rumor has it that a future release +# of portage will allow us to check what version was just removed - which means +# we will be able to invoke this only as needed :) + # Tried doing this via -z, but $INC is too big... + if [[ "${INC}x" != "x" ]]; then + cleaner_msg + epause 5 + fi +} + +pkg_postrm(){ + ${IS_PERL} && dual_scripts +} + +cleaner_msg() { + eerror "You have had multiple versions of perl. It is recommended" + eerror "that you run perl-cleaner now. perl-cleaner will" + eerror "assist with this transition. This script is capable" + eerror "of cleaning out old .ph files, rebuilding modules for " + eerror "your new version of perl, as well as re-emerging" + eerror "applications that compiled against your old libperl$(get_libname)" + eerror + eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT." + eerror "Part of the rebuilding of applications compiled against " + eerror "your old libperl involves temporarily unmerging" + eerror "them - interruptions could leave you with unmerged" + eerror "packages before they can be remerged." + eerror "" + eerror "If you have run perl-cleaner and a package still gives" + eerror "you trouble, and re-emerging it fails to correct" + eerror "the problem, please check http://bugs.gentoo.org/" + eerror "for more information or to report a bug." + eerror "" +} + +src_remove_dual_scripts() { + local i ver ff + ver="$1" + shift + if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then + for i in "$@" ; do + ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*` + ff=${ff##*.1} + alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*" + alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*" + done + else + for i in "$@" ; do + mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die + mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || \ + echo "/usr/share/man/man1/${i}.1 does not exist!" + done + fi +} + +src_remove_extra_files() { + local prefix="./usr" # ./ is important + local bindir="${prefix}/bin" + local libdir="${prefix}/$(get_libdir)" + local perlroot="${libdir}/perl5" # perl installs per-arch dirs + local prV="${perlroot}/${PERL_VER}" + local prVA="${prV}/${myarch}${mythreading}" + + # I made this list from the Mandr*, Debian and ex-Connectiva perl-base list + # Then, I added several files to get GNU autotools running + # FIXME: should this be in a separated file to be sourced? + local MINIMAL_PERL_INSTALL=" + ${bindir}/h2ph + ${bindir}/perl + ${bindir}/perl${MY_PV} + ${bindir}/pod2man + ${libdir}/${LIBPERL} + ${libdir}/libperl$(get_libname) + ${libdir}/libperl$(get_libname ${SHORT_PV}) + ${prV}/attributes.pm + ${prV}/AutoLoader.pm + ${prV}/autouse.pm + ${prV}/base.pm + ${prV}/bigint.pm + ${prV}/bignum.pm + ${prV}/bigrat.pm + ${prV}/blib.pm + ${prV}/bytes_heavy.pl + ${prV}/bytes.pm + ${prV}/Carp/Heavy.pm + ${prV}/Carp.pm + ${prV}/charnames.pm + ${prV}/Class/Struct.pm + ${prV}/constant.pm + ${prV}/diagnostics.pm + ${prV}/DirHandle.pm + ${prV}/Exporter/Heavy.pm + ${prV}/Exporter.pm + ${prV}/ExtUtils/Command.pm + ${prV}/ExtUtils/Constant.pm + ${prV}/ExtUtils/Embed.pm + ${prV}/ExtUtils/Installed.pm + ${prV}/ExtUtils/Install.pm + ${prV}/ExtUtils/Liblist.pm + ${prV}/ExtUtils/MakeMaker.pm + ${prV}/ExtUtils/Manifest.pm + ${prV}/ExtUtils/Mkbootstrap.pm + ${prV}/ExtUtils/Mksymlists.pm + ${prV}/ExtUtils/MM_Any.pm + ${prV}/ExtUtils/MM_MacOS.pm + ${prV}/ExtUtils/MM.pm + ${prV}/ExtUtils/MM_Unix.pm + ${prV}/ExtUtils/MY.pm + ${prV}/ExtUtils/Packlist.pm + ${prV}/ExtUtils/testlib.pm + ${prV}/ExtUtils/Miniperl.pm + ${prV}/ExtUtils/Command/MM.pm + ${prV}/ExtUtils/Constant/Base.pm + ${prV}/ExtUtils/Constant/Utils.pm + ${prV}/ExtUtils/Constant/XS.pm + ${prV}/ExtUtils/Liblist/Kid.pm + ${prV}/ExtUtils/MakeMaker/bytes.pm + ${prV}/ExtUtils/MakeMaker/vmsish.pm + ${prV}/fields.pm + ${prV}/File/Basename.pm + ${prV}/File/Compare.pm + ${prV}/File/Copy.pm + ${prV}/File/Find.pm + ${prV}/FileHandle.pm + ${prV}/File/Path.pm + ${prV}/File/Spec.pm + ${prV}/File/Spec/Unix.pm + ${prV}/File/stat.pm + ${prV}/filetest.pm + ${prVA}/attrs.pm + ${prVA}/auto/attrs + ${prVA}/auto/Cwd/Cwd$(get_libname) + ${prVA}/auto/Data/Dumper/Dumper$(get_libname) + ${prVA}/auto/DynaLoader/dl_findfile.al + ${prVA}/auto/Fcntl/Fcntl$(get_libname) + ${prVA}/auto/File/Glob/Glob$(get_libname) + ${prVA}/auto/IO/IO$(get_libname) + ${prVA}/auto/POSIX/autosplit.ix + ${prVA}/auto/POSIX/fstat.al + ${prVA}/auto/POSIX/load_imports.al + ${prVA}/auto/POSIX/POSIX.bs + ${prVA}/auto/POSIX/POSIX$(get_libname) + ${prVA}/auto/POSIX/stat.al + ${prVA}/auto/POSIX/tmpfile.al + ${prVA}/auto/re/re$(get_libname) + ${prVA}/auto/Socket/Socket$(get_libname) + ${prVA}/auto/Storable/autosplit.ix + ${prVA}/auto/Storable/_retrieve.al + ${prVA}/auto/Storable/retrieve.al + ${prVA}/auto/Storable/Storable$(get_libname) + ${prVA}/auto/Storable/_store.al + ${prVA}/auto/Storable/store.al + ${prVA}/B/Deparse.pm + ${prVA}/B.pm + ${prVA}/Config.pm + ${prVA}/Config_heavy.pl + ${prVA}/CORE/libperl$(get_libname) + ${prVA}/Cwd.pm + ${prVA}/Data/Dumper.pm + ${prVA}/DynaLoader.pm + ${prVA}/encoding.pm + ${prVA}/Errno.pm + ${prVA}/Fcntl.pm + ${prVA}/File/Glob.pm + ${prVA}/_h2ph_pre.ph + ${prVA}/IO/File.pm + ${prVA}/IO/Handle.pm + ${prVA}/IO/Pipe.pm + ${prVA}/IO.pm + ${prVA}/IO/Seekable.pm + ${prVA}/IO/Select.pm + ${prVA}/IO/Socket.pm + ${prVA}/lib.pm + ${prVA}/NDBM_File.pm + ${prVA}/ops.pm + ${prVA}/POSIX.pm + ${prVA}/re.pm + ${prVA}/Socket.pm + ${prVA}/Storable.pm + ${prVA}/threads + ${prVA}/threads.pm + ${prVA}/XSLoader.pm + ${prV}/Getopt/Long.pm + ${prV}/Getopt/Std.pm + ${prV}/if.pm + ${prV}/integer.pm + ${prV}/IO/Socket/INET.pm + ${prV}/IO/Socket/UNIX.pm + ${prV}/IPC/Open2.pm + ${prV}/IPC/Open3.pm + ${prV}/less.pm + ${prV}/List/Util.pm + ${prV}/locale.pm + ${prV}/open.pm + ${prV}/overload.pm + ${prV}/Pod/InputObjects.pm + ${prV}/Pod/Man.pm + ${prV}/Pod/ParseLink.pm + ${prV}/Pod/Parser.pm + ${prV}/Pod/Select.pm + ${prV}/Pod/Text.pm + ${prV}/Pod/Usage.pm + ${prV}/PerlIO.pm + ${prV}/Scalar/Util.pm + ${prV}/SelectSaver.pm + ${prV}/sigtrap.pm + ${prV}/sort.pm + ${prV}/stat.pl + ${prV}/strict.pm + ${prV}/subs.pm + ${prV}/Symbol.pm + ${prV}/Text/ParseWords.pm + ${prV}/Text/Tabs.pm + ${prV}/Text/Wrap.pm + ${prV}/Time/Local.pm + ${prV}/unicore/Canonical.pl + ${prV}/unicore/Exact.pl + ${prV}/unicore/lib/gc_sc/Digit.pl + ${prV}/unicore/lib/gc_sc/Word.pl + ${prV}/unicore/PVA.pl + ${prV}/unicore/To/Fold.pl + ${prV}/unicore/To/Lower.pl + ${prV}/unicore/To/Upper.pl + ${prV}/utf8_heavy.pl + ${prV}/utf8.pm + ${prV}/vars.pm + ${prV}/vmsish.pm + ${prV}/warnings + ${prV}/warnings.pm + ${prV}/warnings/register.pm" + + pushd "${D}" > /dev/null + # Remove cruft + einfo "Removing files that are not in the minimal install" + echo "${MINIMAL_PERL_INSTALL}" + for f in $(find . -type f ) ; do + has "${f}" ${MINIMAL_PERL_INSTALL} || rm -f "${f}" + done + # Remove empty directories + find . -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null + popd > /dev/null +} -- cgit v1.2.3-18-g5258