gentoo auto-resync : 14:05:2024 - 00:01:24

7 files changed, 30 insertions, 201 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 0b9513885891..f11304d66329 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index c2183721ef2c..937f9149e668 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -4,9 +4,6 @@ AUX gnokii-0.6.31-fix_xgnokii_inclusion.patch 260 BLAKE2B 7f681ed48bcf8f8cb5b07e
 AUX gnokii-0.6.31-gcc5.patch 863 BLAKE2B 4d018cbdc5e071e05811f41db3b0ae936268192978f0588b9e0d6dad4aebdb086d23d1f42bc4c6f878eabef7451e3a5b1d687cd5d989b4c5f9581497b2a0396f SHA512 548a32f93b059e45c8616dedf49a0ce3b0e63463f8ddc3384b473d91bd12c3fab2c6e21de0b09d2b330c189454a2bf3e486aa25122ea58392d9cb11994592086
 AUX gnokii-0.6.31-gcc7.patch 830 BLAKE2B 308123e9f4a341a9ec1b2dd90e6c88b9ba9f2d8bc1114057ed8b0675152ca340cedd4ecc4e6859f84b537ff86c04a193dd24816ce33ed08a1cb3649a7358b138 SHA512 6c6a106d9a0bfd20d35d5ae73537aa3409a721989fc450a315720a11f79c771de077af86434003284c9a187cfd17e9cc6766d8f4db4ccf496a30596ac59b7d8d
 AUX gnokii-0.6.31-sqlite-typo.patch 709 BLAKE2B a469ecb0b86b161cf8773c460cd1dbfe5de528563ff0c02a42ee84dfa8370f80610be8c4bf0c5042bb659ac3b9557ce0d71654717c76dab89571d684b3e4f4ec SHA512 20f96a40f33dcb9097f5a2ebe7beccbe89951298c696194415ccee4a16572fba997e0891a36dd8015db537d1aaf3f5ff6644de762c682e66084eb46b7a0dd274
-AUX gnokii-9999-icon.patch 239 BLAKE2B 17253cc10ccb2b7520c0967821e4a57f56e2292d2d8692cf5879f3b3b0f5304dba257a56dc3c45b920c29b5fbda120daa7bbd3135f9a53880e09447580fd320b SHA512 11ecd345c1bd93a8c0f316b411106bc22c5fecff2a848d075e9feb1bd1581a255dbf5a7eaa7fc525325af9b1c7d90736a7b58104f870f3d7ec329ea0b43c2dc3
-AUX gnokii-9999-translations.patch 196 BLAKE2B e703e57517f370852858bbe945be12697a249dc9743bce5f05b0f3ac1a04bc5c48d16217b7f2f0ef89ed0930cbadff2d758b6407a16bb1d785d329d1a47afc13 SHA512 ac167f1d93abf9ed00cd4761ae3b86fdfda33ec5690bf1c0c62a136fe09d0f57dd0d3abe172a3adafb499cc01655995111bc84343932bc6054d45a8e70097af6
 DIST gnokii-0.6.31.tar.bz2 1237865 BLAKE2B d94c5d44e7075b875037c55448b63c76a27116ad09eeb3c450597d6d65d0cabae65aefc904dcdd868b30fbd17989ce50aecfb2d08dce8ac55e36d1976f0b61da SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d
-EBUILD gnokii-0.6.31-r4.ebuild 3645 BLAKE2B c552591780b5cd2e0e5fb5be5a5e58219f83759ddcfa7f6e2fc93c5c83e3c1eac4acb661e352ce610535345e8a51d463928ef49176165c2a8686492afb2eee04 SHA512 cd83a95afeb7dcf724d534b12033b59df8b3cd940321bece928de1dcc525c5520a292da29e1324c390a415419e89bfba974fc269d289a0394f1df7ccf7f5810e
-EBUILD gnokii-9999.ebuild 3360 BLAKE2B 0ed001bae1106cf684705480ffbb92abe0979f9b347c1910cb1d2cd4a2ca0ae7ca07ca1d0348e8a6ce50d38134c3aee169bf0f368c6ed19606dfb19867cf29d3 SHA512 52e8b0a60cba2d152c9f990df8b8ce290de6c82ee8bec4fd4cb5cd06af1fd5a68215c769ff81360cabd14ba58ccf3aa9995508c76582f4108f61a05ce3680d5d
-MISC metadata.xml 789 BLAKE2B f760861215b40c9c80c33ea36c90b8e9f5a4679de093f74f99091610edd67138e56ee8197357a31595791de8d422b4707f8b3acdc148c57f9a8083b41f3c1b9f SHA512 4ead485685c7ce35700fbb260fc6d15fe1875304dbe177bf586f1aeb52fe15038feac1d3bd79f3a8f6d0d7e5768d19d663ee122ec2d2988c2cb22badce5ade8e
+EBUILD gnokii-0.6.31-r5.ebuild 3064 BLAKE2B e9d30ee2c677533001baa8a780a1c3aa751e823007d4e81b68a3bc6f5f35e48a3a050d160d0df20382b586cecdad6ad1278c4b7b23e97c29d28484452a46b697 SHA512 37a2d67d9864ff64276f4459996cd69037bde8e90aa870cb84b9cb699aec91026a1b8cf5b6a40e0185a103b73b011f94f1f24e66d110f3af5f332c6588634c20
+MISC metadata.xml 866 BLAKE2B 170524eb0fea2c90ebb2710f47d2408080e28ffbf02c479d24ed82d49f6022dff4fe2a3f1f61e9aeeabd2571e2c0fd101f1fbdcf5e2d6063f311f1cc1ddd0bce SHA512 e666c11d1fb06612d84d133b42ac87460c287e2b341fddc9f7197f4eb6312f142d2e7a458a53e95687c533927ad2f1f9253442ca50a247d929847a5013a7b689
diff --git a/app-mobilephone/gnokii/files/gnokii-9999-icon.patch b/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
deleted file mode 100644
index 13ca2cf6e4ce..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xgnokii/xgnokii.desktop.in
-+++ b/xgnokii/xgnokii.desktop.in
-@@ -2,7 +2,7 @@
- _Name=Xgnokii
- _GenericName=Mobile Phone Suite
- _Comment=Manage your mobile phone
--Icon=phone
-+Icon=xgnokii
- Exec=xgnokii
- Terminal=false
- Type=Application
diff --git a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
deleted file mode 100644
index 2f61cc222738..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -57,6 +57,7 @@
- smsd/pq.c
- smsd/smsd.c
- smsd/sqlite.c
-+utils/gnokii-configure.glade
- utils/mgnokiidev.c
- xgnokii/xgnokii.c
- xgnokii/xgnokii_calendar.c
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r4.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
index 0e7fe85f1478..ecb43f31fb9f 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r4.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
@@ -1,28 +1,23 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools desktop linux-info strip-linguas
 
 HOMEPAGE="https://www.gnokii.org/"
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="
-		git://git.savannah.nongnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
 DESCRIPTION="User space driver and tools for use with mobile phones"
+SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
 
 RDEPEND="
 	!app-mobilephone/smstools
 	dev-libs/glib:2
+	sys-libs/readline:=
 	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
 	ical? ( dev-libs/libical:= )
 	pcsc-lite? ( sys-apps/pcsc-lite )
@@ -33,7 +28,8 @@ RDEPEND="
 	usb? ( virtual/libusb:0 )
 	X? ( x11-libs/gtk+:2 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	irda? ( virtual/os-headers )
 	nls? ( sys-devel/gettext )
@@ -56,12 +52,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	[[ ${PV} == *9999 ]] && \
-		PATCHES=(
-			"${FILESDIR}"/${P}-icon.patch
-			"${FILESDIR}"/${P}-translations.patch
-		)
-
 	default
 
 	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
@@ -85,23 +75,24 @@ src_configure() {
 		config_xdebug="--disable-xdebug"
 	fi
 
-	econf \
-		--disable-static \
-		--enable-security \
-		--disable-unix98test \
-		$(use_enable bluetooth) \
-		${config_xdebug} \
-		$(use_enable debug fulldebug) \
-		$(use_enable debug rlpdebug) \
-		$(use_enable ical libical) \
-		$(use_enable irda) \
-		$(use_enable mysql) \
-		$(use_enable nls) \
-		$(use_enable pcsc-lite libpcsclite) \
-		$(use_enable postgres) \
-		$(use_enable sms smsd) \
-		$(use_enable usb libusb) \
+	local myeconfargs=(
+		--enable-security
+		--disable-unix98test
+		$(use_enable bluetooth)
+		${config_xdebug}
+		$(use_enable debug fulldebug)
+		$(use_enable debug rlpdebug)
+		$(use_enable ical libical)
+		$(use_enable irda)
+		$(use_enable mysql)
+		$(use_enable nls)
+		$(use_enable pcsc-lite libpcsclite)
+		$(use_enable postgres)
+		$(use_enable sms smsd)
+		$(use_enable usb libusb)
 		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
@@ -137,10 +128,4 @@ pkg_postinst() {
 	elog "Make sure the user that runs gnokii has read/write access to the device"
 	elog "which your phone is connected to."
 	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ ${PV} == *9999 ]]; then
-		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
-		elog "You can keep track of the most recent commits at:"
-		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
-		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
-	fi
 }
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
deleted file mode 100644
index 5031ffef4a3d..000000000000
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop linux-info strip-linguas
-
-HOMEPAGE="https://www.gnokii.org/"
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="
-		git://git.savannah.nongnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-DESCRIPTION="User space driver and tools for use with mobile phones"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
-
-RDEPEND="
-	!app-mobilephone/smstools
-	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
-	ical? ( dev-libs/libical:= )
-	pcsc-lite? ( sys-apps/pcsc-lite )
-	sms? (
-		dev-libs/glib:2
-		postgres? ( dev-db/postgresql:* )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~UNIX98_PTYS"
-
-S="${WORKDIR}/${PN}-${PV%.1}"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
-	"${FILESDIR}"/${P}-gcc5.patch
-)
-
-src_prepare() {
-	[[ ${PV} == *9999 ]] && \
-		PATCHES=(
-			"${FILESDIR}"/${P}-icon.patch
-			"${FILESDIR}"/${P}-translations.patch
-		)
-
-	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas ${MY_AVAILABLE_LINGUAS}
-
-	local config_xdebug
-	if use X && use debug; then
-		config_xdebug="--enable-xdebug"
-	else
-		config_xdebug="--disable-xdebug"
-	fi
-
-	econf \
-		--disable-static \
-		--disable-unix98test \
-		$(use_enable bluetooth) \
-		${config_xdebug} \
-		$(use_enable debug fulldebug) \
-		$(use_enable debug rlpdebug) \
-		$(use_enable ical libical) \
-		$(use_enable irda) \
-		$(use_enable mysql) \
-		$(use_enable nls) \
-		$(use_enable pcsc-lite libpcsclite) \
-		$(use_enable postgres) \
-		$(use_enable sms smsd) \
-		$(use_enable usb libusb) \
-		$(use_with X x)
-}
-
-src_test() {
-	echo common/phones/fake.c >> po/POTFILES.in || die
-	default
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc
-	doins Docs/sample/gnokiirc
-
-	# only one file needs suid root to make a pseudo device
-	fperms 4755 /usr/sbin/mgnokiidev
-
-	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
-
-	if use sms; then
-		cd smsd || die
-
-		docinto smsd
-		use mysql && dodoc sms.tables.mysql.sql README.MySQL
-		use postgres && dodoc sms.tables.pq.sql
-		dodoc README ChangeLog README.Tru64 action
-	fi
-}
-
-pkg_postinst() {
-	elog "Make sure the user that runs gnokii has read/write access to the device"
-	elog "which your phone is connected to."
-	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ ${PV} == *9999 ]]; then
-		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
-		elog "You can keep track of the most recent commits at:"
-		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
-		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
-	fi
-}
diff --git a/app-mobilephone/gnokii/metadata.xml b/app-mobilephone/gnokii/metadata.xml
index 92b0244c867b..8dddbab7845c 100644
--- a/app-mobilephone/gnokii/metadata.xml
+++ b/app-mobilephone/gnokii/metadata.xml
@@ -14,4 +14,7 @@
     <flag name="sms">Enable SMS support (build smsd)</flag>
     <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">gnokii</remote-id>
+  </upstream>
 </pkgmetadata>