commit: 205128fe33408cbbf0fc3fcef915b2dc417f135f Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Thu Oct 31 17:36:43 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Thu Oct 31 23:17:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205128fe
app-emacs/emacsql: drop old 3.1.1 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> app-emacs/emacsql/Manifest | 1 - app-emacs/emacsql/emacsql-3.1.1.ebuild | 80 ---------------------- .../files/emacsql-3.1.1-fix-utf8-bom-writing.patch | 52 -------------- 3 files changed, 133 deletions(-) diff --git a/app-emacs/emacsql/Manifest b/app-emacs/emacsql/Manifest index bc02e8a21541..53272adae899 100644 --- a/app-emacs/emacsql/Manifest +++ b/app-emacs/emacsql/Manifest @@ -1,4 +1,3 @@ -DIST emacsql-3.1.1.tar.gz 2392710 BLAKE2B 7281c9630c26363d9e88463a3ead8b241a3fc1a5e87cbf855eb233ef6b295ca6ba4ea4a79b5137b27f9eed33012dfaa183dab7be8e76b240305ee921edebe874 SHA512 0ec3890cfa014a0afef23e2e38bcd844527b0a497bbfe6f89cbbb090811d43996074e642f83f7f49b27659fc51a901645a54aac600e9988dcb40fffe86a06fbf DIST emacsql-4.0.0.tar.gz 2398791 BLAKE2B 55a67c5da79e290ba1024a8704113276d6db9d05e539eba79bded01d4092c3565a50c48608cb0932ad0e06d0b1a378e61cceffc8bb910c03da717c6f0a70e62b SHA512 040d8fc9a28505102791ea203d8cb58520ea871b2abc937a128e7d26eba62e89886094874c69806a3e6e5e01cafff5d9caf699438693b03ccd383aa5f94ae949 DIST emacsql-4.0.1.tar.gz 2398167 BLAKE2B a88470cf561f50e64e4efc1a291cd55b192a4b8c414cf928f81dc8003aefe3b651cd21ea69a5a11de1c07f9e30edeb000a6e95d760eba44f15381a04f5c96b32 SHA512 3b1d6ced510e4bf0cf71da35279ca962584a1d54ab648795249aa77df7ce230e6ccd849dad498a36901de12827d6a633e5015a00b6e96533e77cdfe001c16e7b DIST emacsql-4.0.3.tar.gz 2398435 BLAKE2B 3c66b922b63a1265660e59cf0319583f98bb6d51347fb6abd76e12d1ff0d9bb92501fb1e35bb4cbe83f8338d6b03e25d3a0536e78998f252ad210d80971e701a SHA512 a8ea07ddae35f993bfd9b19f4d0964ae3128d362e1e377e917a715d5c1dfb0c2dda0fd7ad17664f0e7e70342deeb780f99c5cd66be9b80aff46dd11a91c20984 diff --git a/app-emacs/emacsql/emacsql-3.1.1.ebuild b/app-emacs/emacsql/emacsql-3.1.1.ebuild deleted file mode 100644 index 3ba6d2c8d2a6..000000000000 --- a/app-emacs/emacsql/emacsql-3.1.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -NEED_EMACS=25.1 -inherit edo elisp toolchain-funcs - -DESCRIPTION="A high-level Emacs Lisp RDBMS front-end" -HOMEPAGE="https://github.com/magit/emacsql"; - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/magit/${PN}.git"; -else - SRC_URI=" - https://github.com/magit/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64" -fi - -LICENSE="Unlicense" -SLOT="0" -# TODO(arsen): postgres-pg using app-emacs/pg (unpackaged as of yet) -IUSE="+sqlite postgres mysql" - -DEPEND=" - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND=" - ${DEPEND} - postgres? ( dev-db/postgresql ) - mysql? ( virtual/mysql ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-3.1.1-fix-utf8-bom-writing.patch" -) - -SITEFILE="50${PN}-gentoo.el" - -src_prepare() { - default - - # Not packaged. - rm emacsql-pg.el || die - - local -A backends=( - [sqlite]=sqlite - [postgres]=psql - [mysql]=mysql - ) - - for useflag in "${!backends[@]}"; do - if ! use "${useflag}"; then - rm emacsql-"${backends[${useflag}]}".el || die - fi - done -} - -src_compile() { - if use sqlite; then - edo $(tc-getCC) -fPIC -Wall -Wextra \ - $($(tc-getPKG_CONFIG) --cflags --libs sqlite3) \ - ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o emacsql-sqlite \ - sqlite/emacsql.c - fi - elisp_src_compile -} - -src_install() { - elisp_src_install - - if use sqlite; then - exeinto "${SITELISP}"/emacsql/sqlite - doexe emacsql-sqlite - fi -} diff --git a/app-emacs/emacsql/files/emacsql-3.1.1-fix-utf8-bom-writing.patch b/app-emacs/emacsql/files/emacsql-3.1.1-fix-utf8-bom-writing.patch deleted file mode 100644 index ffa30dec85cb..000000000000 --- a/app-emacs/emacsql/files/emacsql-3.1.1-fix-utf8-bom-writing.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3cec7dcb201568a09ee9cebf0ea1e43cba9d334a Mon Sep 17 00:00:00 2001 -From: Jonas Bernoulli <[email protected]> -Date: Tue, 17 Jan 2023 17:33:37 +0100 -Subject: [PATCH] Use utf-8 coding-system instead of utf-8-auto -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes an issue that was merely triggered by a change in Emacs -[1]. [2: 127bb98] started binding `coding-system-for-write' and -`coding-system-for-read' to `utf-8-auto'. As Eli points out at [3] -`utf-8-auto' was probably a mistake and `utf-8' should have been -used instead. - -1: https://github.com/emacsmirror/emacs/commit/cfd2b3504ab5de6eb5 - -2: 2014-02-02 127bb98df20d84117d34822f50ea584af81b19c3 - Set coding system to utf-8-auto for sqlite. - -3: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60872#11. - - > Setting coding-system-for-write to utf-8-auto makes no sense; - > that coding-system's _only_ raison d'être is for using in - > coding-system-for-read, i.e. when decoding stuff that may or - > may not start with a BOM. - -Since EmacSQL is not a general-purpose database but instead stores -data encoded by Emacs for later retrieval by Emacs only, we do not -have to with the unlikely appearance of a BOM, so we can use `utf-8' -instead of `utf-8-auto' for writes *and* reads. - -Re #104, #106, magit/forge#533, magit/forge#535, bug#60872. ---- - emacsql-sqlite.el | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/emacsql-sqlite.el b/emacsql-sqlite.el -index 1193147..7b8876f 100644 ---- a/emacsql-sqlite.el -+++ b/emacsql-sqlite.el -@@ -73,8 +73,9 @@ used.") - ((connection emacsql-sqlite-connection) &rest _rest) - (emacsql-sqlite-ensure-binary) - (let* ((process-connection-type nil) ; use a pipe -- (coding-system-for-write 'utf-8-auto) -- (coding-system-for-read 'utf-8-auto) -+ ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60872#11. -+ (coding-system-for-write 'utf-8) -+ (coding-system-for-read 'utf-8) - (file (slot-value connection 'file)) - (buffer (generate-new-buffer " *emacsql-sqlite*")) - (fullfile (if file (expand-file-name file) ":memory:"))
