From 7768877d88b11459e342ec1f77759d68f87923aa Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 20 Sep 2017 17:48:34 +0200
Subject: [PATCH] libmetalink: bump version.

---
 ...-0.1.2.recipe => libmetalink-0.1.3.recipe} | 13 ++++----
 .../patches/libmetalink-0.1.2.patchset        | 31 -------------------
 2 files changed, 7 insertions(+), 37 deletions(-)
 rename media-libs/libmetalink/{libmetalink-0.1.2.recipe => libmetalink-0.1.3.recipe} (78%)
 delete mode 100644 media-libs/libmetalink/patches/libmetalink-0.1.2.patchset

diff --git a/media-libs/libmetalink/libmetalink-0.1.2.recipe b/media-libs/libmetalink/libmetalink-0.1.3.recipe
similarity index 78%
rename from media-libs/libmetalink/libmetalink-0.1.2.recipe
rename to media-libs/libmetalink/libmetalink-0.1.3.recipe
index 7b3047754..bcbffd2b2 100644
--- a/media-libs/libmetalink/libmetalink-0.1.2.recipe
+++ b/media-libs/libmetalink/libmetalink-0.1.3.recipe
@@ -5,17 +5,16 @@ description format. It supports Metalink version 3 and Metalink version 4 \
 HOMEPAGE="http://launchpad.net/libmetalink"
 COPYRIGHT="2008 Tatsuhiro Tsujikawa"
 LICENSE="MIT"
-REVISION="4"
-SOURCE_URI="https://launchpad.net/libmetalink/trunk/packagingfix/+download/libmetalink-$portVersion.tar.bz2"
-CHECKSUM_SHA256="cbed9121bf550ef14a434d6ed3d8806ded7a339db16b698cfa2f39fdc3d48bf6"
-PATCHES="libmetalink-$portVersion.patchset"
+REVISION="1"
+SOURCE_URI="https://launchpad.net/libmetalink/trunk/libmetalink-$portVersion/+download/libmetalink-$portVersion.tar.xz"
+CHECKSUM_SHA256="86312620c5b64c694b91f9cc355eabbd358fa92195b3e99517504076bf9fe33a"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libmetalink$secondaryArchSuffix = $portVersion compat >= 0
-	lib:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3
+	lib:libmetalink$secondaryArchSuffix = 3.1.0 compat >= 3
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -24,7 +23,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libmetalink${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3
+	devel:libmetalink$secondaryArchSuffix = 3.1.0 compat >= 3
 	"
 REQUIRES_devel="
 	libmetalink$secondaryArchSuffix == $portVersion base
@@ -62,6 +61,8 @@ INSTALL()
 {
 	make install
 
+	rm $libDir/libmetalink.la
+
 	prepareInstalledDevelLibs libmetalink
 	fixPkgconfig
 
diff --git a/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset b/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset
deleted file mode 100644
index bc946ba29..000000000
--- a/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset
+++ /dev/null
@@ -1,31 +0,0 @@
-From d04fd063299d5bb51ad4f1a84aa00beab5ed1170 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Fri, 13 Jun 2014 14:18:29 +0000
-Subject: haiku patch
-
-
-diff --git a/configure.ac b/configure.ac
-index 1d2e686..1643fe5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,7 @@ AC_SUBST([NUMBER_VERSION], `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSIO
- # Checks for libraries.
- 
- if test "x$with_libexpat" = "xyes"; then
--  AM_PATH_LIBEXPAT
-+   PKG_CHECK_MODULES([EXPAT],[expat],[have_libexpat=yes])
- fi
- 
- if test "x$with_libxml2" = "xyes" && test "x$have_libexpat" != "xyes"; then
-@@ -185,7 +185,7 @@ AC_MSG_NOTICE([summary of build options:
-     CPPFLAGS:       ${CPPFLAGS}
-     C preprocessor: ${CPP}
-     Library types:  Shared=${enable_shared}, Static=${enable_static}
--    Libexpat:       ${have_libexpat} ${EXPAT_CFLAGS} ${EXPAT_LIBS}
-+    Libexpat:       ${have_expat} ${EXPAT_CFLAGS} ${EXPAT_LIBS}
-     Libxml2:        ${have_libxml2} ${XML_CPPFLAGS} ${XML_LIBS}
-     CUnit:          ${have_cunit} ${CUNIT_CFLAGS} ${CUNIT_LIBS}
- ])
--- 
-1.8.3.4
-