package/erlang-xmpp: renamed from erlang-p1-xmpp

This package has been renamed to avoid patching the packages that expect
to find its content in the xmpp/ directory. Thus, remove the
corresponding patch in the ejabberd package.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
[yann.morin.1998@free.fr: update .checkpackageignore]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

.checkpackageignore

@@ -466,7 +466,6 @@ package/efl/0003-ecore_fb-fix-build-with-tslib.patch lib_patch.Upstream
 package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-compone.patch lib_patch.Upstream
 package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch lib_patch.Upstream
 package/ejabberd/0002-fix-ejabberdctl.patch lib_patch.Upstream
-package/ejabberd/0003-correct-includes.patch lib_patch.Upstream
 package/ejabberd/S50ejabberd Shellcheck lib_sysv.Indent lib_sysv.Variables
 package/ejabberd/check-erlang-lib Shellcheck
 package/elftosb/0001-fixes-includes.patch lib_patch.Upstream

Config.in.legacy

@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2024.11"
 
+config BR2_PACKAGE_ERLANG_P1_XMPP
+	bool "erlang-p1-xmpp has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ERLANG_XMPP
+	help
+	  The erlang-p1-xmpp package has been renamed to erlang-xmpp.
+
 config BR2_PACKAGE_ERLANG_P1_XML
 	bool "erlang-p1-xml has been renamed"
 	select BR2_LEGACY

DEVELOPERS

@@ -1679,11 +1679,11 @@ F:	package/erlang-p1-sip/
 F:	package/erlang-p1-stringprep/
 F:	package/erlang-p1-tls/
 F:	package/erlang-p1-utils/
-F:	package/erlang-p1-xmpp/
 F:	package/erlang-p1-yaml/
 F:	package/erlang-p1-yconf/
 F:	package/erlang-p1-zlib/
 F:	package/erlang-stun/
+F:	package/erlang-xmpp/
 F:	package/forge/
 F:	package/nginx-dav-ext/
 F:	package/vis-network/

package/Config.in

@@ -688,11 +688,11 @@ menu "Erlang libraries/modules"
 	source "package/erlang-p1-stringprep/Config.in"
 	source "package/erlang-p1-tls/Config.in"
 	source "package/erlang-p1-utils/Config.in"
-	source "package/erlang-p1-xmpp/Config.in"
 	source "package/erlang-p1-yaml/Config.in"
 	source "package/erlang-p1-yconf/Config.in"
 	source "package/erlang-p1-zlib/Config.in"
 	source "package/erlang-stun/Config.in"
+	source "package/erlang-xmpp/Config.in"
 endmenu
 endif
 	source "package/execline/Config.in"

package/ejabberd/Config.in

@@ -17,11 +17,11 @@ config BR2_PACKAGE_EJABBERD
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
 	select BR2_PACKAGE_ERLANG_P1_TLS
 	select BR2_PACKAGE_ERLANG_P1_UTILS
-	select BR2_PACKAGE_ERLANG_P1_XMPP
 	select BR2_PACKAGE_ERLANG_P1_YAML
 	select BR2_PACKAGE_ERLANG_P1_YCONF # runtime
 	select BR2_PACKAGE_ERLANG_P1_ZLIB
 	select BR2_PACKAGE_ERLANG_STUN
+	select BR2_PACKAGE_ERLANG_XMPP
 	select BR2_PACKAGE_GETENT
 	select BR2_PACKAGE_OPENSSL
 	help

package/ejabberd/ejabberd.mk

@@ -12,8 +12,8 @@ EJABBERD_CPE_ID_VENDOR = process-one
 EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \
 	erlang-lager erlang-p1-cache-tab erlang-p1-sip \
 	erlang-p1-stringprep erlang-stun erlang-p1-tls \
-	erlang-p1-utils erlang-fast-xml erlang-p1-xmpp erlang-p1-yaml \
-	erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp
+	erlang-p1-utils erlang-fast-xml erlang-xmpp erlang-p1-yaml \
+	erlang-p1-zlib host-erlang-p1-utils host-erlang-xmpp
 
 # 0001-Makefile.in-do-not-download-or-compile-dependencies.patch
 # updates Makefile.in

package/erlang-p1-xmpp/erlang-p1-xmpp.mk

@@ -1,17 +0,0 @@
-################################################################################
-#
-# erlang-p1-xmpp
-#
-################################################################################
-
-ERLANG_P1_XMPP_VERSION = 1.6.2
-ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
-ERLANG_P1_XMPP_LICENSE = Apache-2.0
-ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
-ERLANG_P1_XMPP_INSTALL_STAGING = YES
-ERLANG_P1_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \
-	erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml
-HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-fast-xml
-
-$(eval $(rebar-package))
-$(eval $(host-rebar-package))

package/erlang-xmpp/Config.in

@@ -1,8 +1,8 @@
-comment "erlang-p1-xmpp needs a toolchain w/ C++"
+comment "erlang-xmpp needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
-config BR2_PACKAGE_ERLANG_P1_XMPP
-	bool "erlang-p1-xmpp"
+config BR2_PACKAGE_ERLANG_XMPP
+	bool "erlang-xmpp"
 	depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep
 	select BR2_PACKAGE_ERLANG_FAST_XML
 	select BR2_PACKAGE_ERLANG_IDNA

package/erlang-xmpp/erlang-xmpp.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  c227e3a32af4973308120aa726b945c2d3ab7187d47343fe65eb30e95bade0b0  erlang-p1-xmpp-1.6.2.tar.gz
+sha256  c227e3a32af4973308120aa726b945c2d3ab7187d47343fe65eb30e95bade0b0  erlang-xmpp-1.6.2.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt

package/erlang-xmpp/erlang-xmpp.mk

@@ -0,0 +1,17 @@
+################################################################################
+#
+# erlang-xmpp
+#
+################################################################################
+
+ERLANG_XMPP_VERSION = 1.6.2
+ERLANG_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_XMPP_VERSION))
+ERLANG_XMPP_LICENSE = Apache-2.0
+ERLANG_XMPP_LICENSE_FILES = LICENSE.txt
+ERLANG_XMPP_INSTALL_STAGING = YES
+ERLANG_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \
+	erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml
+HOST_ERLANG_XMPP_DEPENDENCIES = host-erlang-fast-xml
+
+$(eval $(rebar-package))
+$(eval $(host-rebar-package))