gmime: rename from gmime3

* drop gmime(2), it's not used by anything
* make gmime3{,-devel} a transitional subpackage

common/shlibs

@@ -745,7 +745,6 @@ libpulsecore-15.0.so libpulseaudio-15.0_1
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
-libgmime-2.6.so.0 gmime-2.6.4_1
 libtotem-plparser.so.18 totem-pl-parser-3.26.1_1
 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1
 libgladeui-2.so.13 libgladeui3-3.38.0_1
@@ -3574,7 +3573,7 @@ libcloudproviders.so.0 libcloudproviders-0.2.5_2
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
-libgmime-3.0.so.0 gmime3-3.2.3_1
+libgmime-3.0.so.0 gmime-3.2.3_1
 libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7

srcpkgs/gmime/files/iconv-detect.h

@@ -2,4 +2,5 @@
 
 #define ICONV_ISO_INT_FORMAT "iso-%u-%u"
 #define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
 #define ICONV_10646 "iso-10646"

srcpkgs/gmime/files/musl-iconv-detect.h

@@ -2,4 +2,5 @@
 
 #define ICONV_ISO_INT_FORMAT "iso-%u-%u"
 #define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
 #define ICONV_10646 "UCS-4BE"

srcpkgs/gmime/template

@@ -1,43 +1,57 @@
 # Template file for 'gmime'
 pkgname=gmime
-version=2.6.23
+version=3.2.7
-revision=4
+revision=2
+wrksrc="gmime-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --disable-mono --enable-smime
+configure_args="--disable-static --enable-crypto $(vopt_enable vala)
- --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
+ $(vopt_enable gir introspection)"
-hostmakedepends="automake pkg-config intltool libtool
+hostmakedepends="pkg-config $(vopt_if vala vala)"
- $(vopt_if gir gobject-introspection)"
+makedepends="glib-devel gpgme-devel libidn2-devel
-makedepends="glib-devel gpgme-devel"
+ $(vopt_if vala vala)"
+checkdepends="gnupg2"
 short_desc="GNOME Core mime parsing library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
-homepage="http://www.gnome.org/"
+homepage="https://github.com/jstedfast/gmime"
 distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=7149686a71ca42a1390869b6074815106b061aaeaaa8f2ef8c12c191d9a79f6a
+checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
 
-# Package build options
+build_options="gir vala"
-build_options="gir"
+build_options_default="gir vala"
-build_options_default="gir"
 
-if [ "$CROSS_BUILD" ]; then
+pre_configure() {
-	configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
+	[ -z "$CROSS_BUILD" ] && return 0
-	configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
-	configure_args+=" am_cv_proto_iconv_arg1="
-fi
 
-pre_build() {
+	configure_args+=" ac_cv_have_iconv_detect_h=yes"
-	if [ -z "$CROSS_BUILD" ]; then
+
-		:
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	elif [ "$XBPS_TARGET_LIBC" = musl ]; then
 		cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
 	else
-		cp ${FILESDIR}/iconv-detect.h ${wrksrc}
+		cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
+	fi
+}
+
+do_check() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		make check VERBOSITY=-vv |
+		awk '
+			1
+			# utf-8 to iso-2022-jp is stateless
+			/GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
+			# euc-kr has not been supported
+			/euc-kr to UTF-8/ { next }
+			$NF == "FAILED" { e = 1 }
+			END { exit e }
+		'
+	else
+		make check
 	fi
 }
 
 gmime-devel_package() {
-	depends="libglib-devel zlib-devel gmime>=${version}_${revision}"
+	depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -45,7 +59,22 @@ gmime-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 		if [ "$build_option_gir" ]; then
-			vmove "usr/share/gir-*"
+			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }
+
+gmime3_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+gmime3-devel_package() {
+	depends="${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}

srcpkgs/gmime/update

@@ -1 +0,0 @@
-ignore="3*" # Packages in gmime3

srcpkgs/gmime3

@@ -0,0 +1 @@
+gmime

srcpkgs/gmime3-devel

@@ -1 +1 @@
-gmime3
+gmime

srcpkgs/gmime3/files/iconv-detect.h

@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "iso-10646"

srcpkgs/gmime3/files/musl-iconv-detect.h

@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "UCS-4BE"

srcpkgs/gmime3/template

@@ -1,68 +0,0 @@
-# Template file for 'gmime3'
-pkgname=gmime3
-version=3.2.7
-revision=1
-wrksrc="gmime-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --enable-crypto $(vopt_enable vala)
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config $(vopt_if vala vala)"
-makedepends="glib-devel gpgme-devel libidn2-devel
- $(vopt_if vala vala)"
-checkdepends="gnupg2"
-short_desc="GNOME Core mime parsing library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/jstedfast/gmime"
-distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
-
-build_options="gir vala"
-build_options_default="gir vala"
-
-pre_configure() {
-	[ -z "$CROSS_BUILD" ] && return 0
-
-	configure_args+=" ac_cv_have_iconv_detect_h=yes"
-
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
-	else
-		cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
-	fi
-}
-
-do_check() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		make check VERBOSITY=-vv |
-		awk '
-			1
-			# utf-8 to iso-2022-jp is stateless
-			/GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
-			# euc-kr has not been supported
-			/euc-kr to UTF-8/ { next }
-			$NF == "FAILED" { e = 1 }
-			END { exit e }
-		'
-	else
-		make check
-	fi
-}
-
-gmime3-devel_package() {
-	depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
-			vmove usr/share/vala
-		fi
-	}
-}

srcpkgs/gmime3/update

@@ -1 +0,0 @@
-pkgname=gmime