diff options
| -rw-r--r-- | app-editors/xemacs/Manifest | 2 | ||||
| -rw-r--r-- | app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch | 28 | ||||
| -rw-r--r-- | app-editors/xemacs/xemacs-21.4.24-r1.ebuild (renamed from app-editors/xemacs/xemacs-21.5.34-r2.ebuild) | 126 | ||||
| -rw-r--r-- | app-editors/xemacs/xemacs-21.5.31.ebuild | 238 | ||||
| -rw-r--r-- | app-editors/xemacs/xemacs-21.5.33.ebuild | 236 | ||||
| -rw-r--r-- | app-editors/xemacs/xemacs-21.5.34-r3.ebuild | 250 | ||||
| -rw-r--r-- | dev-db/postgresql/postgresql-9.5.5.ebuild | 27 | ||||
| -rw-r--r-- | dev-db/postgresql/postgresql-9.5.6.ebuild | 26 | ||||
| -rw-r--r-- | dev-db/postgresql/postgresql-9.6.1-r1.ebuild | 26 | ||||
| -rw-r--r-- | dev-db/postgresql/postgresql-9.6.2.ebuild | 26 | ||||
| -rw-r--r-- | dev-db/postgresql/postgresql-9999.ebuild | 26 | ||||
| -rw-r--r-- | dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.200.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-perl/File-Remove/File-Remove-1.570.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-perl/Variable-Magic/Variable-Magic-0.610.0.ebuild | 2 | ||||
| -rw-r--r-- | sys-auth/pam_p11/pam_p11-0.1.6.ebuild | 2 |
15 files changed, 168 insertions, 851 deletions
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index ba31b4f22859..21a3c53553a4 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -1,6 +1,4 @@ DIST NeXT_XEmacs.tar.gz 39571 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 WHIRLPOOL d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae DIST xemacs-21.4.22.tar.gz 8357931 SHA256 87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1 SHA512 7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8 WHIRLPOOL f1d313aa2dee7f4238190b90c10dc951a31302563a8a098e69ed740e85f428ac360b363e44f1e618f2d97782b5532846df290e9f79f11abdc7648a1e380cb44e DIST xemacs-21.4.24.tar.gz 8543879 SHA256 9016a51496d4978cf3dba75000a8e38bfc8cb4ca3a3f3e71371aa19259f26cd5 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 WHIRLPOOL 469d52341833037e22cebeb6b554435c81b3f5749f64d86ddf31c3990dfc08a57f49fab7e868ab8c2009d1cae665f4fd731813f25c942d5aafd287ad7736a049 -DIST xemacs-21.5.31.tar.gz 15802193 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d SHA512 17c385459edffc063d43537dae5b2883d2d7481e7f7596d02c9859ecb9dd4ee48921647b389ed979d65ede2745b647c9b196c9ef0873e6d526d21262f04b7f41 WHIRLPOOL b2a1741af341f260671e1c8479f47c30113b515b240d86b41b6449abde96be896371d3f6b038ab72a96c422f84704de0a41e403a16c9ca2a4861e590e65b1f59 -DIST xemacs-21.5.33.tar.gz 15781151 SHA256 448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151 WHIRLPOOL 29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454 DIST xemacs-21.5.34.tar.gz 15816932 SHA256 33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a WHIRLPOOL 733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209 diff --git a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch new file mode 100644 index 000000000000..62d26ccc053c --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch @@ -0,0 +1,28 @@ +Don't define deprecated glibc symbol + +Avoid defining the deprecated symbols _BSD_SOURCE and _SVID_SOURCE +that xmkmf thinks are needed to compile X programs. + +diff -r 09d56098ea2c -r 32a8151f8af7 configure.in +--- a/configure.in Sat Feb 11 01:24:06 2017 +0100 ++++ b/configure.in Sat Feb 11 01:59:40 2017 +0100 +@@ -2868,10 +2868,15 @@ + * ) val=1 ;; + esac + dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above. +- if grep "^#define $sym " confdefs.h >/dev/null; then :; else +- if test "$val" = "1" +- then AC_DEFINE_UNQUOTED($sym) +- else AC_DEFINE_UNQUOTED($sym,$val) ++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf ++dnl likes us to define; ignore them if appropriate. ++ if grep "^#define $sym " confdefs.h >/dev/null || \ ++ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \ ++ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE"; ++ then :; else ++ if test "$val" = "1" ++ then AC_DEFINE_UNQUOTED($sym) ++ else AC_DEFINE_UNQUOTED($sym,$val) + fi + fi ;; + esac diff --git a/app-editors/xemacs/xemacs-21.5.34-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild index 466483af8be9..e9e6f8a04e28 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r2.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild @@ -1,70 +1,69 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with a hardened profile. If you # want to use xemacs on a hardened profile then compile with the # -nopie flag in CFLAGS or help fix bug #75028. -EAPI=4 +EAPI="5" -WANT_AUTOCONF="2.5" -inherit eutils flag-o-matic multilib +WANT_AUTOCONF="2.1" +inherit autotools eutils flag-o-matic toolchain-funcs DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="http://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz +SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" -LICENSE="GPL-3+" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb" X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" RDEPEND=" - berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) + berkdb? ( sys-libs/db:= ) + gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql ) + postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) - alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0[xft=] ) + motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) - xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn ) - >=sys-libs/ncurses-5.2 + !amd64? ( freewnn? ( app-i18n/freewnn ) ) + >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15" DEPEND="${RDEPEND} - virtual/pkgconfig" + >=sys-apps/texinfo-5" PDEPEND="app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )" src_unpack() { - default_src_unpack - + unpack ${P}.tar.gz use neXt && unpack NeXT_XEmacs.tar.gz } src_prepare() { - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ - find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - epatch "${FILESDIR}/${P}-ncurses-tinfo.patch" + # see bug 58350, 102540 and 143580 + epatch "${FILESDIR}"/xemacs-21.4.19-db.patch + # see bug 576512 + epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch + epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). @@ -72,6 +71,14 @@ src_prepare() { sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die + + # Run autoconf. XEmacs tries to be smart by providing a stub + # configure.ac file for autoconf 2.59 but this throws our + # autotools eclass so it must be removed first. + rm "${S}"/configure.ac || die + eautoconf + + use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ } src_configure() { @@ -89,7 +96,7 @@ src_configure() { myconf="${myconf} --with-scrollbars=motif" myconf="${myconf} --with-menubars=lucid" fi - if use athena or use Xaw3d ; then + if use athena ; then myconf="--with-scrollbars=athena" fi @@ -103,20 +110,13 @@ src_configure() { use dnd && myconf="${myconf} --with-dragndrop --with-offix" - myconf="${myconf} $(use_with tiff )" - myconf="${myconf} $(use_with png )" - myconf="${myconf} $(use_with jpeg )" - myconf="${myconf} $(use_with xface )" - - use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" || - myconf="${myconf} --with-xft=no" - + myconf="${myconf} $(use_with tiff ) $(use_with png )" + myconf="${myconf} $(use_with jpeg ) $(use_with xface )" else myconf="${myconf} --without-x --without-xpm --without-dragndrop - --with-xft=no --with-gif=no" fi @@ -133,8 +133,7 @@ src_configure() { myconf="${myconf} --with-xim=no" fi - myconf="${myconf} $(use_with canna )" - myconf="${myconf} $(use_with freewnn wnn )" + myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )" fi # This determines the type of sounds we are playing @@ -142,12 +141,12 @@ src_configure() { # This determines how these sounds should be played use nas && soundconf="${soundconf},nas" - use alsa && soundconf="${soundconf},alsa" myconf="${myconf} --with-sound=${soundconf}" if use gdbm || use berkdb ; then - use gdbm && mydb="gdbm" + use gdbm && mydb="gdbm" + use berkdb && mydb="${mydb},berkdb" myconf="${myconf} --with-database=${mydb}" @@ -155,45 +154,52 @@ src_configure() { myconf="${myconf} --without-database" fi - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" + # fixes #21264, this should be fixed in 21.4.21 and has been fixed + # in 21.5 for sure. Now that 21.4.21 is out there is no real + # evidence that this indeed got fixed, so keep these exceptions + # for now. + use alpha && myconf="${myconf} --with-system-malloc" + use ppc64 && myconf="${myconf} --with-system-malloc" + use ia64 && myconf="${myconf} --with-system-malloc" + + # Enabling modules will cause segfaults outside the XEmacs build directory + use ia64 && myconf="${myconf} --without-modules" - econf ${myconf} \ + einfo "${myconf}" + + # see bug 576512 + append-cflags -fgnu89-inline + + # Don't use econf because it uses options which this configure + # script does not understand (like --host). + ./configure ${myconf} ${EXTRA_ECONF} \ $(use_with gif ) \ $(use_with gpm ) \ $(use_with postgres postgresql ) \ $(use_with ldap ) \ $(use_with eolconv file-coding ) \ $(use_with pop ) \ + --compiler=$(tc-getCC) \ --prefix=/usr \ --with-ncurses \ --with-msw=no \ - --with-mail-locking=flock \ + --mail-locking=flock \ --with-site-lisp=yes \ --with-site-modules=yes \ - --with-newgc \ - --enable-option-checking=no \ - --with-last-packages=/usr/lib/xemacs \ - || die "configuration failed" -} - -src_compile() { - emake EMACSLOADPATH="${S}"/lisp + || die "The configure script failed to run properly" } src_install() { emake prefix="${D}"/usr \ mandir="${D}"/usr/share/man/man1 \ infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - datadir="${D}"/usr/share \ - install || die + install gzip-el || die "emake install failed" # Rename some applications installed in bin so that it is clear # which application installed them and so that conflicting # packages (emacs) can't clobber the actual applications. # Addresses bug #62991. - for i in b2m ctags etags gnuclient gnudoit gnuattach; do + for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" done @@ -218,7 +224,8 @@ src_install() { rm -f dir info.info texinfo* termcap* standards* cd "${S}" - dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* + dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README* + dodoc "${FILESDIR}"/README.Gentoo newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm @@ -228,19 +235,6 @@ src_install() { pkg_postinst() { eselect emacs update ifunset eselect gnuclient update ifunset - - einfo "*************************************************" - einfo "If you are upgrading from XEmacs 21.4 you should note the following" - einfo "incompatibilities:" - einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5" - einfo "- The X resource class has changed from Emacs to XEmacs," - einfo " settings in your .Xdefaults file should be updated accordingly." - - if use xft; - then - einfo "You have enabled Xft font support. Xft requires font names to be provided" - einfo "in a different way, so you may need to adjust your .Xdefaults accordingly." - fi } pkg_postrm() { diff --git a/app-editors/xemacs/xemacs-21.5.31.ebuild b/app-editors/xemacs/xemacs-21.5.31.ebuild deleted file mode 100644 index 78de2d05cb4c..000000000000 --- a/app-editors/xemacs/xemacs-21.5.31.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: xemacs currently does not work with a hardened profile. If you -# want to use xemacs on a hardened profile then compile with the -# -nopie flag in CFLAGS or help fix bug #75028. - -EAPI=4 - -WANT_AUTOCONF="2.5" -inherit eutils flag-o-matic multilib - -DESCRIPTION="highly customizable open source text editor and application development system" -HOMEPAGE="http://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" - -X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" - -RDEPEND=" - berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) - >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.6:0 - >=media-libs/audiofile-0.2.3 - gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql ) - ldap? ( net-nds/openldap ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) - dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0[xft=] ) - athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) - xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) - neXt? ( x11-libs/neXtaw ) - xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) - png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( virtual/jpeg:0 ) - canna? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn ) - >=sys-libs/ncurses-5.2" - -DEPEND="${RDEPEND} - >=app-eselect/eselect-emacs-1.2" - -PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" - -src_unpack() { - default_src_unpack - - use neXt && unpack NeXT_XEmacs.tar.gz -} - -src_prepare() { - # Fix problem caused by improper optimization with GCC 4.1.2 on x86 - # (and possibly other arches, but only confirmed on x86). See - # http://tracker.xemacs.org/XEmacs/its/issue354 for the upstream - # bug. - epatch "${FILESDIR}"/${PN}-21.5.29-optimization-bug.patch - - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ -} - -src_configure() { - local myconf="" - - if use X; then - - myconf="${myconf} --with-widgets=athena" - myconf="${myconf} --with-dialogs=athena" - myconf="${myconf} --with-menubars=lucid" - myconf="${myconf} --with-scrollbars=lucid" - if use motif ; then - myconf="--with-widgets=motif" - myconf="${myconf} --with-dialogs=motif" - myconf="${myconf} --with-scrollbars=motif" - myconf="${myconf} --with-menubars=lucid" - fi - if use athena or use Xaw3d ; then - myconf="--with-scrollbars=athena" - fi - - if use Xaw3d; then - myconf="${myconf} --with-athena=3d" - elif use neXt; then - myconf="${myconf} --with-athena=next" - else - myconf="${myconf} --with-athena=xaw" - fi - - use dnd && myconf="${myconf} --with-dragndrop --with-offix" - - myconf="${myconf} $(use_with tiff )" - myconf="${myconf} $(use_with png )" - myconf="${myconf} $(use_with jpeg )" - myconf="${myconf} $(use_with xface )" - - use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" || - myconf="${myconf} --with-xft=no" - - else - myconf="${myconf} - --without-x - --without-xpm - --without-dragndrop - --with-xft=no - --with-gif=no" - fi - - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi - else - myconf="${myconf} --with-xim=no" - fi - - myconf="${myconf} $(use_with canna )" - myconf="${myconf} $(use_with freewnn wnn )" - fi - - # This determines the type of sounds we are playing - local soundconf="native" - - # This determines how these sounds should be played - use nas && soundconf="${soundconf},nas" - use alsa && soundconf="${soundconf},alsa" - - myconf="${myconf} --with-sound=${soundconf}" - - if use gdbm || use berkdb ; then - use gdbm && mydb="gdbm" - use berkdb && mydb="${mydb},berkdb" - - myconf="${myconf} --with-database=${mydb}" - else - myconf="${myconf} --without-database" - fi - - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" - - econf ${myconf} \ - $(use_with gif ) \ - $(use_with gpm ) \ - $(use_with postgres postgresql ) \ - $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ - $(use_with pop ) \ - --prefix=/usr \ - --with-ncurses \ - --with-msw=no \ - --with-mail-locking=flock \ - --with-site-lisp=yes \ - --with-site-modules=yes \ - --with-newgc \ - --enable-option-checking=no \ - --with-last-packages=/usr/lib/xemacs \ - || die "configuration failed" -} - -src_install() { - emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - datadir="${D}"/usr/share \ - install gzip-el || die - - # Rename some applications installed in bin so that it is clear - # which application installed them and so that conflicting - # packages (emacs) can't clobber the actual applications. - # Addresses bug #62991. - for i in b2m ctags etags ; do - mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" - done - - # rename man pages - for i in ctags etags; do - mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" - done - - # install base packages directories - dodir /usr/lib/xemacs/xemacs-packages/ - dodir /usr/lib/xemacs/site-packages/ - dodir /usr/lib/xemacs/site-modules/ - dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi - - # remove extraneous info files - cd "${D}"/usr/share/info - rm -f dir info.info texinfo* termcap* standards* - - cd "${S}" - dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* - - newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm - - domenu "${FILESDIR}"/${PN}.desktop -} - -pkg_postinst() { - eselect emacs update ifunset - - einfo "If you are upgrading from XEmacs 21.4 you should note the following" - einfo "incompatibilities:" - einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5" - einfo "- The X resource class has changed from Emacs to XEmacs," - einfo " settings in your .Xdefaults file should be updated accordingly." - - if use xft; - then - einfo "You have enabled Xft font support. Xft requires font names to be provided" - einfo "in a different way, so you may need to adjust your .Xdefaults accordingly." - fi -} - -pkg_postrm() { - eselect emacs update ifunset -} diff --git a/app-editors/xemacs/xemacs-21.5.33.ebuild b/app-editors/xemacs/xemacs-21.5.33.ebuild deleted file mode 100644 index 8b01f8a02d34..000000000000 --- a/app-editors/xemacs/xemacs-21.5.33.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: xemacs currently does not work with a hardened profile. If you -# want to use xemacs on a hardened profile then compile with the -# -nopie flag in CFLAGS or help fix bug #75028. - -EAPI=4 - -WANT_AUTOCONF="2.5" -inherit eutils flag-o-matic multilib - -DESCRIPTION="highly customizable open source text editor and application development system" -HOMEPAGE="http://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" - -X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" - -RDEPEND=" - berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) - >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.6:0 - >=media-libs/audiofile-0.2.3 - gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql ) - ldap? ( net-nds/openldap ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) - dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0[xft=] ) - athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) - xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) - neXt? ( x11-libs/neXtaw ) - xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) - png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( virtual/jpeg:0 ) - canna? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn ) - >=sys-libs/ncurses-5.2" - -DEPEND="${RDEPEND} - >=app-eselect/eselect-emacs-1.2" - -PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" - -src_unpack() { - default_src_unpack - - use neXt && unpack NeXT_XEmacs.tar.gz -} - -src_prepare() { - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ - - # Fix for no-mule build. - find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - epatch "${FILESDIR}"/${P}-no-mule-build.patch -} - -src_configure() { - local myconf="" - - if use X; then - - myconf="${myconf} --with-widgets=athena" - myconf="${myconf} --with-dialogs=athena" - myconf="${myconf} --with-menubars=lucid" - myconf="${myconf} --with-scrollbars=lucid" - if use motif ; then - myconf="--with-widgets=motif" - myconf="${myconf} --with-dialogs=motif" - myconf="${myconf} --with-scrollbars=motif" - myconf="${myconf} --with-menubars=lucid" - fi - if use athena or use Xaw3d ; then - myconf="--with-scrollbars=athena" - fi - - if use Xaw3d; then - myconf="${myconf} --with-athena=3d" - elif use neXt; then - myconf="${myconf} --with-athena=next" - else - myconf="${myconf} --with-athena=xaw" - fi - - use dnd && myconf="${myconf} --with-dragndrop --with-offix" - - myconf="${myconf} $(use_with tiff )" - myconf="${myconf} $(use_with png )" - myconf="${myconf} $(use_with jpeg )" - myconf="${myconf} $(use_with xface )" - - use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" || - myconf="${myconf} --with-xft=no" - - else - myconf="${myconf} - --without-x - --without-xpm - --without-dragndrop - --with-xft=no - --with-gif=no" - fi - - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi - else - myconf="${myconf} --with-xim=no" - fi - - myconf="${myconf} $(use_with canna )" - myconf="${myconf} $(use_with freewnn wnn )" - fi - - # This determines the type of sounds we are playing - local soundconf="native" - - # This determines how these sounds should be played - use nas && soundconf="${soundconf},nas" - use alsa && soundconf="${soundconf},alsa" - - myconf="${myconf} --with-sound=${soundconf}" - - if use gdbm || use berkdb ; then - use gdbm && mydb="gdbm" - use berkdb && mydb="${mydb},berkdb" - - myconf="${myconf} --with-database=${mydb}" - else - myconf="${myconf} --without-database" - fi - - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" - - econf ${myconf} \ - $(use_with gif ) \ - $(use_with gpm ) \ - $(use_with postgres postgresql ) \ - $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ - $(use_with pop ) \ - --prefix=/usr \ - --with-ncurses \ - --with-msw=no \ - --with-mail-locking=flock \ - --with-site-lisp=yes \ - --with-site-modules=yes \ - --with-newgc \ - --enable-option-checking=no \ - --with-last-packages=/usr/lib/xemacs \ - || die "configuration failed" -} - -src_install() { - emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - datadir="${D}"/usr/share \ - install gzip-el || die - - # Rename some applications installed in bin so that it is clear - # which application installed them and so that conflicting - # packages (emacs) can't clobber the actual applications. - # Addresses bug #62991. - for i in b2m ctags etags ; do - mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" - done - - # rename man pages - for i in ctags etags; do - mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" - done - - # install base packages directories - dodir /usr/lib/xemacs/xemacs-packages/ - dodir /usr/lib/xemacs/site-packages/ - dodir /usr/lib/xemacs/site-modules/ - dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi - - # remove extraneous info files - cd "${D}"/usr/share/info - rm -f dir info.info texinfo* termcap* standards* - - cd "${S}" - dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* - - newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm - - domenu "${FILESDIR}"/${PN}.desktop -} - -pkg_postinst() { - eselect emacs update ifunset - - einfo "If you are upgrading from XEmacs 21.4 you should note the following" - einfo "incompatibilities:" - einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5" - einfo "- The X resource class has changed from Emacs to XEmacs," - einfo " settings in your .Xdefaults file should be updated accordingly." - - if use xft; - then - einfo "You have enabled Xft font support. Xft requires font names to be provided" - einfo "in a different way, so you may need to adjust your .Xdefaults accordingly." - fi -} - -pkg_postrm() { - eselect emacs update ifunset -} diff --git a/app-editors/xemacs/xemacs-21.5.34-r3.ebuild b/app-editors/xemacs/xemacs-21.5.34-r3.ebuild deleted file mode 100644 index 7ae873cc32f4..000000000000 --- a/app-editors/xemacs/xemacs-21.5.34-r3.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: xemacs currently does not work with a hardened profile. If you -# want to use xemacs on a hardened profile then compile with the -# -nopie flag in CFLAGS or help fix bug #75028. - -EAPI=4 - -WANT_AUTOCONF="2.5" -inherit eutils flag-o-matic multilib - -DESCRIPTION="highly customizable open source text editor and application development system" -HOMEPAGE="http://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" - -X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" - -RDEPEND=" - berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) - >=sys-libs/zlib-1.1.4 - !libressl? ( >=dev-libs/openssl-0.9.6:0 ) - libressl? ( dev-libs/libressl ) - >=media-libs/audiofile-0.2.3 - gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql ) - ldap? ( net-nds/openldap ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) - dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0[xft=] ) - athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) - xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) - neXt? ( x11-libs/neXtaw ) - xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) - png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( virtual/jpeg:0 ) - canna? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn ) - >=sys-libs/ncurses-5.2 - >=app-eselect/eselect-emacs-1.15" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" - -src_unpack() { - default_src_unpack - - use neXt && unpack NeXT_XEmacs.tar.gz -} - -src_prepare() { - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ - find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - epatch "${FILESDIR}/${P}-ncurses-tinfo.patch" - - # Some binaries and man pages are installed under suffixed names - # to avoid collions with their GNU Emacs counterparts (see below). - # Fix internal filename references. - sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die - sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die - sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die -} - -src_configure() { - local myconf="" - - if use X; then - - myconf="${myconf} --with-widgets=athena" - myconf="${myconf} --with-dialogs=athena" - myconf="${myconf} --with-menubars=lucid" - myconf="${myconf} --with-scrollbars=lucid" - if use motif ; then - myconf="--with-widgets=motif" - myconf="${myconf} --with-dialogs=motif" - myconf="${myconf} --with-scrollbars=motif" - myconf="${myconf} --with-menubars=lucid" - fi - if use athena or use Xaw3d ; then - myconf="--with-scrollbars=athena" - fi - - if use Xaw3d; then - myconf="${myconf} --with-athena=3d" - elif use neXt; then - myconf="${myconf} --with-athena=next" - else - myconf="${myconf} --with-athena=xaw" - fi - - use dnd && myconf="${myconf} --with-dragndrop --with-offix" - - myconf="${myconf} $(use_with tiff )" - myconf="${myconf} $(use_with png )" - myconf="${myconf} $(use_with jpeg )" - myconf="${myconf} $(use_with xface )" - - use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" || - myconf="${myconf} --with-xft=no" - - else - myconf="${myconf} - --without-x - --without-xpm - --without-dragndrop - --with-xft=no - --with-gif=no" - fi - - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi - else - myconf="${myconf} --with-xim=no" - fi - - myconf="${myconf} $(use_with canna )" - myconf="${myconf} $(use_with freewnn wnn )" - fi - - # This determines the type of sounds we are playing - local soundconf="native" - - # This determines how these sounds should be played - use nas && soundconf="${soundconf},nas" - use alsa && soundconf="${soundconf},alsa" - - myconf="${myconf} --with-sound=${soundconf}" - - if use gdbm || use berkdb ; then - use gdbm && mydb="gdbm" - use berkdb && mydb="${mydb},berkdb" - - myconf="${myconf} --with-database=${mydb}" - else - myconf="${myconf} --without-database" - fi - - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" - - econf ${myconf} \ - $(use_with gif ) \ - $(use_with gpm ) \ - $(use_with postgres postgresql ) \ - $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ - $(use_with pop ) \ - --prefix=/usr \ - --with-ncurses \ - --with-msw=no \ - --with-mail-locking=flock \ - --with-site-lisp=yes \ - --with-site-modules=yes \ - --with-newgc \ - --enable-option-checking=no \ - --with-last-packages=/usr/lib/xemacs \ - || die "configuration failed" -} - -src_compile() { - emake EMACSLOADPATH="${S}"/lisp -} - -src_install() { - emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - datadir="${D}"/usr/share \ - install || die - - # Rename some applications installed in bin so that it is clear - # which application installed them and so that conflicting - # packages (emacs) can't clobber the actual applications. - # Addresses bug #62991. - for i in b2m ctags etags gnuclient gnudoit gnuattach; do - mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" - done - - # rename man pages - for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do - mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" - done - - # install base packages directories - dodir /usr/lib/xemacs/xemacs-packages/ - dodir /usr/lib/xemacs/site-packages/ - dodir /usr/lib/xemacs/site-modules/ - dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi - - # remove extraneous info files - cd "${D}"/usr/share/info - rm -f dir info.info texinfo* termcap* standards* - - cd "${S}" - dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* - - newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm - - domenu "${FILESDIR}"/${PN}.desktop -} - -pkg_postinst() { - eselect emacs update ifunset - eselect gnuclient update ifunset - - einfo "*************************************************" - einfo "If you are upgrading from XEmacs 21.4 you should note the following" - einfo "incompatibilities:" - einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5" - einfo "- The X resource class has changed from Emacs to XEmacs," - einfo " settings in your .Xdefaults file should be updated accordingly." - - if use xft; - then - einfo "You have enabled Xft font support. Xft requires font names to be provided" - einfo "in a different way, so you may need to adjust your .Xdefaults accordingly." - fi -} - -pkg_postrm() { - eselect emacs update ifunset - eselect gnuclient update ifunset -} diff --git a/dev-db/postgresql/postgresql-9.5.5.ebuild b/dev-db/postgresql/postgresql-9.5.5.ebuild index b352149ac96d..56cafc185c77 100644 --- a/dev-db/postgresql/postgresql-9.5.5.ebuild +++ b/dev-db/postgresql/postgresql-9.5.5.ebuild @@ -350,17 +350,22 @@ pkg_config() { einfo "The database cluster will be created in:" einfo " ${DATA_DIR}" einfo - while [ "$correct" != "true" ] ; do - einfo "Are you ready to continue? (y/n)" - read answer - if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then - correct="true" - elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then - die "Aborting initialization." - else - echo "Answer not recognized" - fi - done + + if [ -z "$PG_AUTOCONFIG" ] ; then + while [ "$correct" != "true" ] ; do + einfo "Are you ready to continue? (y/n)" + read answer + if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then + correct="true" + elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then + die "Aborting initialization." + else + echo "Answer not recognized" + fi + done + else + einfo "PG_AUTOCONFIG set, not prompting" + fi if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then eerror "The given directory, '${DATA_DIR}', is not empty." diff --git a/dev-db/postgresql/postgresql-9.5.6.ebuild b/dev-db/postgresql/postgresql-9.5.6.ebuild index 8e8412b1fc7a..eb493f3f3929 100644 --- a/dev-db/postgresql/postgresql-9.5.6.ebuild +++ b/dev-db/postgresql/postgresql-9.5.6.ebuild @@ -350,17 +350,21 @@ pkg_config() { einfo "The database cluster will be created in:" einfo " ${DATA_DIR}" einfo - while [ "$correct" != "true" ] ; do - einfo "Are you ready to continue? (y/n)" - read answer - if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then - correct="true" - elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then - die "Aborting initialization." - else - echo "Answer not recognized" - fi - done + if [ -z "$PG_AUTOCONFIG" ] ; then + while [ "$correct" != "true" ] ; do + einfo "Are you ready to continue? (y/n)" + read answer + if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then + correct="true" + elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then + die "Aborting initialization." + else + echo "Answer not recognized" + fi + done + else + einfo "PG_AUTOCONFIG set, not prompting" + fi if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then eerror "The given directory, '${DATA_DIR}', is not empty." diff --git a/dev-db/postgresql/postgresql-9.6.1-r1.ebuild b/dev-db/postgresql/postgresql-9.6.1-r1.ebuild index 0c0ba8278ade..0e4412b472c2 100644 --- a/dev-db/postgresql/postgresql-9.6.1-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.6.1-r1.ebuild @@ -347,17 +347,21 @@ pkg_config() { einfo "The database cluster will be created in:" einfo " ${DATA_DIR}" einfo - while [ "$correct" != "true" ] ; do - einfo "Are you ready to continue? (y/n)" - read answer - if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then - correct="true" - elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then - die "Aborting initialization." - else - echo "Answer not recognized" - fi - done + if [ -z "$PG_AUTOCONFIG" ] ; then + while [ "$correct" != "true" ] ; do + einfo "Are you ready to continue? (y/n)" + read answer + if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then + correct="true" + elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then + die "Aborting initialization." + else + echo "Answer not recognized" + fi + done + else + einfo "PG_AUTOCONFIG set, not prompting" + fi if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then eerror "The given directory, '${DATA_DIR}', is not empty." diff --git a/dev-db/postgresql/postgresql-9.6.2.ebuild b/dev-db/postgresql/postgresql-9.6.2.ebuild index 0c0ba8278ade..0e4412b472c2 100644 --- a/dev-db/postgresql/postgresql-9.6.2.ebuild +++ b/dev-db/postgresql/postgresql-9.6.2.ebuild @@ -347,17 +347,21 @@ pkg_config() { einfo "The database cluster will be created in:" einfo " ${DATA_DIR}" einfo - while [ "$correct" != "true" ] ; do - einfo "Are you ready to continue? (y/n)" - read answer - if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then - correct="true" - elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then - die "Aborting initialization." - else - echo "Answer not recognized" - fi - done + if [ -z "$PG_AUTOCONFIG" ] ; then + while [ "$correct" != "true" ] ; do + einfo "Are you ready to continue? (y/n)" + read answer + if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then + correct="true" + elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then + die "Aborting initialization." + else + echo "Answer not recognized" + fi + done + else + einfo "PG_AUTOCONFIG set, not prompting" + fi if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then eerror "The given directory, '${DATA_DIR}', is not empty." diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild index b1d337683362..6a995c154baa 100644 --- a/dev-db/postgresql/postgresql-9999.ebuild +++ b/dev-db/postgresql/postgresql-9999.ebuild @@ -297,17 +297,21 @@ pkg_config() { einfo "The database cluster will be created in:" einfo " ${DATA_DIR}" einfo - while [ "$correct" != "true" ] ; do - einfo "Are you ready to continue? (y/n)" - read answer - if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then - correct="true" - elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then - die "Aborting initialization." - else - echo "Answer not recognized" - fi - done + if [ -z "$PG_AUTOCONFIG" ] ; then + while [ "$correct" != "true" ] ; do + einfo "Are you ready to continue? (y/n)" + read answer + if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then + correct="true" + elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then + die "Aborting initialization." + else + echo "Answer not recognized" + fi + done + else + einfo "PG_AUTOCONFIG set, not prompting" + fi if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then eerror "The given directory, '${DATA_DIR}', is not empty." diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.200.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.200.0.ebuild index 42da5329789c..962892f6686d 100644 --- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.200.0.ebuild +++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.200.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Execute code after a scope finished compilation" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc x86 ~ppc-aix ~x86-fbsd ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc x86 ~ppc-aix ~x86-fbsd ~x64-macos" IUSE="test" RDEPEND=" diff --git a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild index 8a337dc90a5b..22a238051182 100644 --- a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild +++ b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Remove files and directories" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.610.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.610.0.ebuild index 071a37bf64b4..14eaec6a74cd 100644 --- a/dev-perl/Variable-Magic/Variable-Magic-0.610.0.ebuild +++ b/dev-perl/Variable-Magic/Variable-Magic-0.610.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Associate user-defined magic to variables from Perl" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~ppc-aix ~x86-fbsd ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~ppc-aix ~x86-fbsd ~x64-macos" IUSE="test" RDEPEND=" diff --git a/sys-auth/pam_p11/pam_p11-0.1.6.ebuild b/sys-auth/pam_p11/pam_p11-0.1.6.ebuild index 211bc345599d..4c0e7e5760f0 100644 --- a/sys-auth/pam_p11/pam_p11-0.1.6.ebuild +++ b/sys-auth/pam_p11/pam_p11-0.1.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86" IUSE="" RDEPEND="virtual/pam |