diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-editors/xemacs | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'app-editors/xemacs')
-rw-r--r-- | app-editors/xemacs/Manifest | 6 | ||||
-rw-r--r-- | app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch | 24 | ||||
-rw-r--r-- | app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 | ||||
-rw-r--r-- | app-editors/xemacs/xemacs-21.4.24.ebuild | 2 | ||||
-rw-r--r-- | app-editors/xemacs/xemacs-21.5.34-r5.ebuild | 259 |
5 files changed, 289 insertions, 4 deletions
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index 43ca02dd3ebb..f5330f9275e7 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -4,6 +4,7 @@ AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3 AUX xemacs-21.5.34-as-needed.patch 921 BLAKE2B 18b67b2330cda62bb08fccdba8f71d0213f463aeb7e360b8b7f8cd791718cf89f44999858dea9b51a4c1f94b47b6774addd5a1ab9c36d65036f3890925847bb1 SHA512 3b55683346e6a0cac0b0b21ce21f3bc0ca4d2734307a20ce556cdea084e821d9c9be3c69db329ec1546bc249bfa5cae136e393e858bd53105db9152627514285 +AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec40d65bd097c65909fdccb282dbc05fe7014e654f73736f742c68ac24b8118c209b05dc399e2d1cc6109f288ae049e48bfee140d71d1f SHA512 e41b6fd7601dbd59c775e62f390e17c194eab9360cce2ae3d03e1b5f4f7fc59080ecd76401eab5211c2f0ab4fea4baf9746e10675ba00f05115067008cce5a6f AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176 AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765 @@ -11,8 +12,9 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a -EBUILD xemacs-21.4.24-r1.ebuild 6738 BLAKE2B 7a0572e2798dfd14f6a4757883ea1716337df515898f068ae1f99703eaf7b8f48199e0f30ea39e0e4e4f5454f521a89c56cb1e02bd2a5b383bf2066f4ed12ab9 SHA512 c1291830b06b3cc1ac43409a714ed5d67d6d310d7b1f95e7a92bdb729aaa18b253f76d3383852913e5f91fa90b62412f15b973a6f34ff51f2f5f247ce7f8067e +EBUILD xemacs-21.4.24-r1.ebuild 6739 BLAKE2B 2008106ac11ca5535f39f7616f76027e3a0fed4b7fbba798b1746e177a727f5f82b69b897971995ed5fd40665224597f373ac244ad3f24e79966575464e65ca3 SHA512 0b66741feed43ec4d01f33fb557b5fb5e8d20a6b06d7be28271dd2492731c71ae54029929271dcdd26eea733db6420b843283dbf279c9433734c6688d2200f88 EBUILD xemacs-21.4.24-r2.ebuild 7085 BLAKE2B 1e799def26063041aa0b65cb96f9f22a33d87370d26a6ab7faa311862a9a653de8fdf2b446355489bcb8733c746cbbe16fc047a72036edba16b389625a07c299 SHA512 2217a71aead967aafc089089a95bf638fe13ad5293939de35ed0feac6b655ca73a9efc90aebf555e65bb59e4aa12e9ddae08a3dfaf26414ac39c784a5e27761d -EBUILD xemacs-21.4.24.ebuild 6780 BLAKE2B 0470e598a7049669904cb8bcc4a0d3809b6dd83e4bbc2518ebda38ae5aff12d822be22a5b5252bb17b6d8b26110647ce1f6f07535a0f3d61f6dcd66fd84d3092 SHA512 871ce7f54315a72ace4c9c4f0e9118a702f1097995b3f739f43fdcca4ebd703d1fce040a84722745899cb1330fecda0c8a5a50d6669b7caf4f050df0e0a37927 +EBUILD xemacs-21.4.24.ebuild 6781 BLAKE2B 69cd6a5b314a8a578e20ca7e4e7128d2f6077187594508b29de679d6f47087b8b01a83d3665f64cf56a8c6bb5eded514a6cd7acf14ed97e3794f005a6a3ce5d1 SHA512 fb58d55a58c80135465835e10937bfb618b6f1e6fd57eb4673608cbe186840577f02e746369ee7723bb17f3117aff8d87aa3b94f213635fb3cbf1b6a7671d186 EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44 +EBUILD xemacs-21.5.34-r5.ebuild 7311 BLAKE2B 67810b578f75a440df11a75ad20660b928db6d1c6535c2677af9175d4eb9caa1dd1ecbf71465e0a6fb4d7a8a471c27ae5b4cfb21924734f51afe9fc72cf24f29 SHA512 32a2dc82de8d93d9edd950548946549a4cf0fcafb7902e8d84e0dc75fd2643718c8bec10566fcfbdca380dc5466ff4c3e8c95dc65477fe47275c7afba0252b98 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7 diff --git a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch new file mode 100644 index 000000000000..fdea052fba19 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch @@ -0,0 +1,24 @@ +diff -r 3ca291c0f7e3 configure +--- a/configure Sun Jul 28 10:17:08 2019 +0100 ++++ b/configure Fri Mar 06 21:27:48 2020 +0100 +@@ -9987,7 +9987,7 @@ + libc_version="GNU libc $libc_version (Debian)" + fi + if test -z "$libc_version"; then +- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` ++ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` + fi + ;; + +diff -r 3ca291c0f7e3 configure.ac +--- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 ++++ b/configure.ac Fri Mar 06 21:27:48 2020 +0100 +@@ -2347,7 +2347,7 @@ + fi + dnl #### Tested on Debian, does this actually work elsewhere? ;-) + if test -z "$libc_version"; then +- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` ++ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` + fi + ;; + diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild index a9aedfa1795f..032b668af1e9 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm64 hppa ppc ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 arm64 ~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" diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild index 89902016197a..7b39f0f4f265 100644 --- a/app-editors/xemacs/xemacs-21.4.24.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" +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" diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild new file mode 100644 index 000000000000..de468834210d --- /dev/null +++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: xemacs currently does not work with position independent code +# so the build forces the use of the -no-pie option + +EAPI=7 + +inherit autotools eutils flag-o-matic multilib xdg-utils desktop + +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 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +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 + eapply "${FILESDIR}/${P}-ncurses-tinfo.patch" + eapply "${FILESDIR}/${P}-gcc5.patch" + eapply "${FILESDIR}/${P}-glibc-macro.patch" + eapply "${FILESDIR}/${P}-as-needed.patch" + eapply "${FILESDIR}/${P}-configure-libc-version.patch" + + eapply_user + + # 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="" + + # bug #639642 + test-flags -no-pie >/dev/null && append-flags -no-pie + filter-flags -pie + + 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 \ + --with-system-malloc \ + --enable-option-checking=no \ + --with-last-packages=/usr/lib/xemacs +} + +src_compile() { + emake EMACSLOADPATH="${S}"/lisp +} + +src_install() { + emake prefix="${ED}"/usr \ + mandir="${ED}"/usr/share/man/man1 \ + infodir="${ED}"/usr/share/info \ + libdir="${ED}"/usr/$(get_libdir) \ + datadir="${ED}"/usr/share \ + install + + # 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 "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed" + done + + # rename man pages + for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do + mv "${ED}"/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 "${ED}"/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 + xdg_desktop_database_update + + 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 + xdg_desktop_database_update +} |