Cleanup, Version bump (Bug #133187), add myself as maintainer, fix autotools handling (Bug #160169)

(Portage version: 2.1.3_rc8)

14 files changed, 153 insertions, 44 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 13bf5537414d..477970a4698b 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.94 2007/07/08 18:47:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.95 2007/07/22 09:23:51 dertobi123 Exp $
+
+*cyrus-imapd-2.2.13 (22 Jul 2007)
+
+  22 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/cyrus-imapd-2.2.12-db45.patch, +files/cyrus-imapd-2.2-db45.patch,
+  -files/cyrus-imapd-2.2.12-libwrap.patch,
+  +files/cyrus-imapd-2.2.13-afs.patch, +files/cyrus-imapd-2.2.13-drac.patch,
+  +files/cyrus-imapd-2.2.13-pts.patch, +files/cyrus-imapd-2.2-libwrap.patch,
+  metadata.xml, -cyrus-imapd-2.2.12.ebuild, cyrus-imapd-2.2.12-r4.ebuild,
+  cyrus-imapd-2.2.12-r5.ebuild, +cyrus-imapd-2.2.13.ebuild:
+  Cleanup, Version bump (Bug #133187), add myself as maintainer, fix autotools
+  handling (Bug #160169)
 
   08 Jul 2007; Samuli Suominen <drac@gentoo.org> files/cyrus.rc6:
   Replace "need net" with "use net" for bug 116534.
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
index 4eb29a2c44b8..17703ef6ca8f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild,v 1.12 2007/07/14 22:22:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild,v 1.13 2007/07/22 09:23:51 dertobi123 Exp $
 
-inherit eutils ssl-cert fixheadtails pam
+inherit autotools eutils ssl-cert fixheadtails pam
 
 DESCRIPTION="The Cyrus IMAP Server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -149,7 +149,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-parallel.patch
 
 	# db-4.5 fix
-	epatch "${FILESDIR}/${P}-db45.patch"
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
 
 	# Add unsupported patch wrt #18706 and #80630
 	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
@@ -163,7 +163,7 @@ src_unpack() {
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
-		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
 	fi
 
 	# DB4 detection and versioned symbols.
@@ -184,11 +184,8 @@ src_unpack() {
 		man/cyrusmaster.8 || die "sed failed"
 
 	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache || die
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	WANT_AUTOCONF="2.5"
+	eautoreconf
 
 	# When linking with rpm, you need to link with more libraries.
 	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild
index 8c5cd43a9657..b2cc1ee246c9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild,v 1.4 2007/07/14 22:22:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild,v 1.5 2007/07/22 09:23:51 dertobi123 Exp $
 
 inherit eutils ssl-cert fixheadtails pam
 
@@ -161,7 +161,7 @@ src_unpack() {
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
-		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
 	fi
 
 	# DB4 detection and versioned symbols.
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.13.ebuild
index b95413c0611a..e0a0f208ebec 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12.ebuild,v 1.14 2007/07/14 22:22:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.13.ebuild,v 1.1 2007/07/22 09:23:51 dertobi123 Exp $
 
-inherit eutils ssl-cert fixheadtails pam
+inherit autotools eutils ssl-cert fixheadtails pam
 
 DESCRIPTION="The Cyrus IMAP Server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -10,16 +10,16 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc hppa ppc64"
-IUSE="afs drac idled kerberos pam snmp ssl tcpd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
 
 PROVIDE="virtual/imapd"
 RDEPEND=">=sys-libs/db-3.2
 	>=dev-libs/cyrus-sasl-2.1.13
 	afs? ( >=net-fs/openafs-1.2.2 )
 	pam? (
-			>=sys-libs/pam-0.75
-			>=net-mail/mailbase-0.00-r8
+			virtual/pam
+			>=net-mail/mailbase-1
 		)
 	kerberos? ( virtual/krb5 )
 	snmp? ( net-analyzer/net-snmp )
@@ -30,8 +30,7 @@ RDEPEND=">=sys-libs/db-3.2
 DEPEND="$RDEPEND
 	sys-devel/libtool
 	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	>=sys-apps/sed-4"
+	sys-devel/automake"
 
 # "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
 check_useflag() {
@@ -74,6 +73,10 @@ tcpd_flag_check() {
 }
 
 net-snmp_check() {
+	if has_version net-analyzer/ucd-snmp; then
+		tcpd_flag_check net-analyzer/ucd-snmp
+	fi
+
 	if has_version net-analyzer/net-snmp; then
 		tcpd_flag_check net-analyzer/net-snmp
 		# check for minimal USE flag.
@@ -130,6 +133,8 @@ pkg_setup() {
 	if use snmp; then
 		net-snmp_check
 	fi
+
+	enewuser cyrus -1 -1 /usr/cyrus mail
 }
 
 src_unpack() {
@@ -137,6 +142,20 @@ src_unpack() {
 
 	ht_fix_file ${S}/imap/xversion.sh
 
+	# Parallel make fix
+	epatch "${FILESDIR}"/${PN}-parallel.patch
+
+	# db-4.5 fix
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
+
+	# Add unsupported patch wrt #18706 and #80630
+	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
+
+	if use afs; then
+		epatch "${FILESDIR}/${P}-afs.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${P}-pts.patch" || die "epatch failed"
+	fi
+
 	# Add drac database support.
 	if use drac ; then
 		# better check for drac. Bug #79442.
@@ -146,7 +165,7 @@ src_unpack() {
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
-		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
 	fi
 
 	# DB4 detection and versioned symbols.
@@ -156,25 +175,26 @@ src_unpack() {
 
 	# Fix master(8)->cyrusmaster(8) manpage.
 	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -e 's:master\.8:cyrusmaster.8:g' \
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
 			-e 's:master(8):cyrusmaster(8):g' \
-			-i "${i}" || die "sed failed" || die "sed failed"
+			"${i}" || die "sed failed" || die "sed failed"
 	done
 	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -e "s:MASTER:CYRUSMASTER:g" \
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
 		-e "s:Master:Cyrusmaster:g" \
 		-e "s:master:cyrusmaster:g" \
-		-i man/cyrusmaster.8 || die "sed failed"
+		man/cyrusmaster.8 || die "sed failed"
 
 	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache || die
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	WANT_AUTOCONF="2.5"
+#	rm -rf configure config.h.in autom4te.cache || die
+#	ebegin "Recreating configure"
+#	sh SMakefile &>/dev/null || die "SMakefile failed"
+#	eend $?
+	eautoreconf 
 
 	# When linking with rpm, you need to link with more libraries.
-	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
+	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
 }
 
 src_compile() {
@@ -235,14 +255,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/cyrus.rc6" cyrus
 	newconfd "${FILESDIR}/cyrus.confd" cyrus
-
-	if use pam ; then
-		insinto /etc/pam.d
-	# This is now provided by mailbase-0.00-r8. See #79240
-	# 	newins "${FILESDIR}/imap.pam" imap
-	#	newins "${FILESDIR}/imap.pam" pop3
-		newins "${FILESDIR}/imap.pam" sieve
-	fi
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
 
 	if use ssl ; then
 		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
@@ -278,6 +291,8 @@ pkg_postinst() {
 	ewarn "/usr/share/doc/${P}/html/install-configure.html."
 	echo
 
+	enewuser cyrus -1 -1 /usr/cyrus mail
+
 	if df -T /var/imap | grep -q ' ext[23] ' ; then
 		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
 		chattr +S /var/imap/{user,quota}{,/*}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-db45.patch
index c92f957953c8..c92f957953c8 100644
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-db45.patch
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-libwrap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-libwrap.patch
index 6157c879ae88..6157c879ae88 100644
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-libwrap.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-libwrap.patch
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch
new file mode 100644
index 000000000000..96bde0546097
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch
@@ -0,0 +1,22 @@
+--- configure.in.orig   2006-03-31 15:09:06.000000000 -0800
++++ configure.in        2006-03-31 15:08:16.000000000 -0800
+@@ -466,8 +466,12 @@
+          AC_DEFINE(AFSPTS_USE_KRB5,[],[Should the AFS PTS plugin use krb5?])])
+
+ if test "x$with_afs" != "xno"; then
+-    if test ! -d $with_afs; then
+-        $with_afs=/usr/local
++    if test "x$with_afs" != "xyes"; then
++        if test ! -d $with_afs; then
++            with_afs=/usr/local
++        fi
++    else
++        with_afs=/usr
+     fi
+     CFLAGS="${CFLAGS} -I${with_afs}/include"
+     AFS_LIBS="${with_afs}/lib/afs/libkauth.a
+${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a
+${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a
+${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a
+${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a
+${with_afs}/lib/afs/util.a" 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch
new file mode 100644
index 000000000000..7279c6618569
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch
@@ -0,0 +1,43 @@
+--- contrib/drac_auth.patch.orig	2005-01-25 10:56:05.263875816 -0800
++++ contrib/drac_auth.patch	2005-01-25 10:59:32.395359608 -0800
+@@ -71,7 +71,7 @@
+ diff -u -r1.273 configure.in
+ --- configure.in	15 Dec 2003 20:00:35 -0000	1.273
+ +++ configure.in	19 Dec 2003 19:56:16 -0000
+-@@ -945,6 +945,19 @@
++@@ -945,6 +945,20 @@
+  SNMP_SUBDIRS=""
+  AC_SUBST(SNMP_SUBDIRS)
+  
+@@ -80,12 +80,13 @@
+ +dnl
+ +DRACLIBS=
+ +AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
+-+	if test -d "$withval"; then
+-+		LDFLAGS="$LDFLAGS -L${withval}"
+-+		AC_CHECK_LIB(drac, dracauth,
+-+			AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
+-+			DRACLIBS="-ldrac")
+-+	fi)
+++       drac="$withval",
+++       drac="no")
+++if test "$drac" != "no"; then
+++       AC_CHECK_LIB(drac, dracauth,
+++               AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
+++               DRACLIBS="-ldrac")
+++fi
+ +AC_SUBST(DRACLIBS)
+ +
+  CMU_LIBWRAP
+
+
+--- contrib/drac_auth.patch.orig        2006-03-31 15:12:05.000000000 -0800
++++ contrib/drac_auth.patch     2006-03-31 15:14:20.000000000 -0800
+@@ -373,6 +373,6 @@
+ +{ "drachost", "localhost", STRING }
+ +/* Hostname of the RPC dracd server. */
+ +
+- { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist")}
++ { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
+  /* The cyrusdb backend to use for the duplicate delivery suppression
+     and sieve. */ 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch
new file mode 100644
index 000000000000..31b08569ba91
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch
@@ -0,0 +1,19 @@
+--- configure.in.old	2007-07-22 10:00:33.652378056 +0200
++++ configure.in	2007-07-22 10:00:51.386672578 +0200
+@@ -544,11 +544,11 @@
+     LDFLAGS=$save_LDFLAGS
+ fi
+ 
+-if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
+-	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
+-	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
+-	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
+-fi
++#if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
++#	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
++#	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
++#	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
++#fi
+ 
+ SERVER_SUBDIRS="master imap"
+ AC_ARG_ENABLE(server,
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12
deleted file mode 100644
index 9892eb1bb989..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
-RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
-SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.13 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.13
new file mode 100644
index 000000000000..af50da4aeb5a
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.13
@@ -0,0 +1,3 @@
+MD5 3ff679714836d1d7b1e1df0e026d4844 cyrus-imapd-2.2.13.tar.gz 2109770
+RMD160 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 cyrus-imapd-2.2.13.tar.gz 2109770
+SHA256 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c cyrus-imapd-2.2.13.tar.gz 2109770
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
index 0d886946e1f0..611c431848f3 100644
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
@@ -1,3 +1,2 @@
-MD5 cde15876d5c953bba9ad9f7811aff695 cyrus-imapd-2.3.1.tar.gz 2212999
 RMD160 68b40b89f5558afe19886724a8bb8736139254e5 cyrus-imapd-2.3.1.tar.gz 2212999
 SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c cyrus-imapd-2.3.1.tar.gz 2212999
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
index d2b9c507db16..4558e3a68fca 100644
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
@@ -1,3 +1,2 @@
-MD5 5c1d6250747a7a09c8095972043cec01 cyrus-imapd-2.3.6.tar.gz 2250241
 RMD160 c7a07a2e95ca08d0348ce7de2849d56e21341eb0 cyrus-imapd-2.3.6.tar.gz 2250241
 SHA256 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd cyrus-imapd-2.3.6.tar.gz 2250241
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 51f94e3fbe0e..0feff246ee31 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+  <email>dertobi123@gentoo.org</email>
+</maintainer>
 <herd>net-mail</herd>
 </pkgmetadata>