5 files changed, 3 insertions, 136 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 8206134fed3c..4540f7345a2d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest
index ca570be3359a..da90ca37296c 100644
--- a/x11-misc/xsel/Manifest
+++ b/x11-misc/xsel/Manifest
@@ -1,8 +1,6 @@
 AUX xsel-1.2.0-Werror.patch 398 BLAKE2B e322155e11356a890096b861513acd8c6523c85922076f8310a9fa9d7212206d677fbfaca49d455f8fa929228280a5028f77045cbbb7b18989529bd887e8853c SHA512 fb68421d5ecd58f33bde15ea770ffdf22a3f356f4b05ed9588e572fc5d9fccff267e1019b4a984e5a62497cb6b0d4927038a16777da378d63eef8135dc5c9b06
-AUX xsel-1.2.0_p20220310-Werror.patch 1119 BLAKE2B 5be555e315ffa64ab847ad2efe40229e2fa0ec1e03a3618bb71aecdc5f34715cc7ccee2256cab443b526a9c7a538627d886cfa23c60ff41156dd7f26e4a6d1de SHA512 2d9666a55b1b7cf0e8e9e5bfe8d73390396c15e65e3f836d5b52dc2f7b729b89a9f7a6c38ed4edd99583704cfd6dd3f502726483b13b88288bf71a58db363c6d
-AUX xsel-1.2.0_p20220310-modernize.patch 2289 BLAKE2B f2d7fa577131c2ad0abf2589e7bf56fd166ae70fbe0f3bc1c6a6e33cd93fb1f7b41dd585d4da7fd901fe7b3e278d7d207b4969c5a9222ef3cf90db70619f5c24 SHA512 2ca261ccb2009400f95db5fc569bda234f21315249fb92d245c51a85e6d91d16c99b192371e205a261390a4c75cb31b938faa35a7fa2cbc0decf230c3e5df10c
 DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f
-DIST xsel-1.2.0_p20220310.tar.gz 51746 BLAKE2B b4de6c40b48d54f7ba83d92908e82032975511bb1cd974d8b060fcf8f93e66840dcd832d4ded8111695aa581ab1314c16db3514d40f26b868c22214ee69ea9c5 SHA512 4d4fad1dc6cdbbd8915ea303cd905b7a2a3a1efd866c2f174afd170f5372e4a272eab57b1a40c714c64d3c0178acc78d18cae6e4a621edd0e81534c203d0d4da
+DIST xsel-1.2.1.tar.gz 51621 BLAKE2B c9c066e4032d71c8c9e717c1251ce929590a7e3be9a156f54eb2625b3877b683e1a3f53f88c405b3f9986160ec38a3a737fe919f703ab307d1e74c97ef81c9f8 SHA512 549874679a2d2979fca851ce762870165f5cbe60ba3f15e0690080506a78ea0b2c52833bbf7868eb3988fc377a103c31c62367fb9c5d1eb606e0660985f82ca4
 EBUILD xsel-1.2.0-r2.ebuild 703 BLAKE2B 867fda3fde75c2f45d9e4c4e87781717cbe64f45edaf63d32329442a0afc7ddf990479a67a8552eedea341670375e8bd7c74a80692a0779615ce6c92061f01b3 SHA512 7e5afd6f817a211808dbd9cfc4d3f3e96ea8f104f24e13d5341f32595540cf86616ffe5a22f92ff6a36fc8ae0fe170ec142c84f6c4396966843351af8e3fceac
-EBUILD xsel-1.2.0_p20220310.ebuild 810 BLAKE2B 9565ddd99adc9ca4253136c010a84ec0941ba84e71b72cd22ad150c6e1185aa0328411f7024a112746a1704baff839d38033149564ff2a01c297431fd709a914 SHA512 0d598c35506d20654d68741ba3aaa4c0f017c5b2d3055a6f5938405a632851176db3a1decc17a54b51dfdb2fc93a4318cf083a0acab273cad3fed967bbcb2008
+EBUILD xsel-1.2.1.ebuild 639 BLAKE2B f95ee88e02a9f5371ab04b13e67c05142fb731823d0d996c67d591919679c6aaf98b86dee58fc7a1b38600be09745d56451871d0824793d71447c679f7c86136 SHA512 12e44a369d70d0f9eae34997c5205dfad6c58701ebe6c1112fcad27a4ca60aa9e87957b419f27914398ea41b8c827b3ecd4f8d1de768a6aaba2d57d857a6f791
 MISC metadata.xml 532 BLAKE2B 0c0aa0233f75b40faae2c19f834ca0abf179e34fbfae771f01584d950885fa7da6245311554fd2108cf7b1f6d092ae444ae314795b8c8ff39665c68ca91b6256 SHA512 d2ac7f9402680dd719e6c92455cafe09d24c98b2e7daa177bccdb594421f50dedfe5c09010d4466aa64062361d166d1dd5e1337784bf0c3fca92c28b68241731
diff --git a/x11-misc/xsel/files/xsel-1.2.0_p20220310-Werror.patch b/x11-misc/xsel/files/xsel-1.2.0_p20220310-Werror.patch
deleted file mode 100644
index 5589f81a36d7..000000000000
--- a/x11-misc/xsel/files/xsel-1.2.0_p20220310-Werror.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2a47fb141cc317a8eec7542a22c348f6abcec8a2 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Mon, 17 Apr 2023 12:21:52 +0200
-Subject: [PATCH] configure.ac: do not add `-Werror` to compile line
-
-* With every new compiler release, it breaks:
-  https://flameeyes.blog/2009/02/25/future-proof-your-code-dont-use-werror/
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 77dc524..fd20279 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AM_CONFIG_HEADER(config.h)
- # Checks for programs.
- AC_ISC_POSIX
- AC_PROG_CC
-+AC_PROG_CC_C99
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
-@@ -24,7 +25,7 @@ AC_SEARCH_LIBS([XOpenDisplay], [X11], [], [AC_MSG_ERROR([libX11 is required])])
- dnl Add some useful warnings if we have gcc.
- dnl changequote(,)dnl
- if test "x$ac_cv_prog_gcc" = xyes ; then
--  CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Werror -g -std=gnu99 -Wdeclaration-after-statement -Wno-unused"
-+  CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wdeclaration-after-statement -Wno-unused"
- fi
- dnl changequote([,])dnl
- 
diff --git a/x11-misc/xsel/files/xsel-1.2.0_p20220310-modernize.patch b/x11-misc/xsel/files/xsel-1.2.0_p20220310-modernize.patch
deleted file mode 100644
index 0d25ce13ac0f..000000000000
--- a/x11-misc/xsel/files/xsel-1.2.0_p20220310-modernize.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 633443e093845d61b16049081c17d6f08f266c6e Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Mon, 17 Apr 2023 12:21:53 +0200
-Subject: [PATCH] configure.ac: modernize
-
----
- Makefile.am  |  8 +++-----
- configure.ac | 23 ++++++-----------------
- 2 files changed, 9 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2f55306..b72bc23 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,12 +1,10 @@
- ## Process this file with automake to produce Makefile.in
- 
--EXTRA_DIST = xsel.1x
--
--AM_CFLAGS = @X_CFLAGS@
--LDADD = @X_LIBS@
-+AM_CPPFLAGS = $(X_CFLAGS)
-+LDADD = $(X_LIBS)
- 
- bin_PROGRAMS = xsel
- 
- xsel_SOURCES = xsel.c xsel.h
- 
--man_MANS = xsel.1x
-+dist_man_MANS = xsel.1x
-diff --git a/configure.ac b/configure.ac
-index fd20279..5e78b86 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,36 +1,27 @@
- # Process this file with autoconf to produce a configure script.
--AC_INIT([xsel.c])
--AM_INIT_AUTOMAKE(xsel, 1.2.0)
-+AC_INIT([xsel],[1.2.0])
-+AM_INIT_AUTOMAKE([1.14 foreign dist-xz subdir-objects])
- AC_CONFIG_SRCDIR([xsel.c])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- # Checks for programs.
--AC_ISC_POSIX
- AC_PROG_CC
--AC_PROG_CC_C99
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
- # Checks for libraries.
--AC_PATH_XTRA
--AC_SUBST(X_CFLAGS)
--AC_SUBST(X_LDFLAGS)
--AC_SUBST(X_LIBS)
--AC_SUBST(X_EXTRA_LIBS)
--
--AC_SEARCH_LIBS([XOpenDisplay], [X11], [], [AC_MSG_ERROR([libX11 is required])])
-+PKG_CHECK_MODULES([X], [x11])
- 
- # Error out on compile warnings
- dnl Add some useful warnings if we have gcc.
- dnl changequote(,)dnl
--if test "x$ac_cv_prog_gcc" = xyes ; then
-+AS_IF([test "x$ac_cv_c_compiler_gnu" = xyes], [
-   CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wdeclaration-after-statement -Wno-unused"
--fi
-+])
- dnl changequote([,])dnl
- 
- # Checks for header files.
--AC_HEADER_STDC
- AC_CHECK_HEADERS([errno.h fcntl.h stdlib.h string.h sys/time.h unistd.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
-@@ -38,13 +29,11 @@ AC_C_CONST
- AC_TYPE_PID_T
- AC_TYPE_SIZE_T
- AC_CHECK_MEMBERS([struct stat.st_blksize])
--AC_HEADER_TIME
- AC_TYPE_UID_T
- 
- # Checks for library functions.
- AC_FUNC_FORK
- AC_FUNC_MALLOC
--AC_TYPE_SIGNAL
- AC_CHECK_FUNCS([dup2 select strdup strerror strtol])
- 
- AC_CONFIG_FILES([Makefile])
diff --git a/x11-misc/xsel/xsel-1.2.0_p20220310.ebuild b/x11-misc/xsel/xsel-1.2.1.ebuild
index bd499f87e976..3ad0d603b50c 100644
--- a/x11-misc/xsel/xsel-1.2.0_p20220310.ebuild
+++ b/x11-misc/xsel/xsel-1.2.1.ebuild
@@ -5,12 +5,9 @@ EAPI=8
 
 inherit autotools
 
-GIT_COMMIT="9fc4e3e4e3f1231cabfdc2e1438155f9390bc517"
-
 DESCRIPTION="Command-line program for getting and setting the contents of the X selection"
 HOMEPAGE="https://vergenet.net/~conrad/software/xsel"
-SRC_URI="https://github.com/kfish/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+SRC_URI="https://github.com/kfish/xsel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
@@ -20,11 +17,6 @@ DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-Werror.patch
-	"${FILESDIR}"/${P}-modernize.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf