libzip: move zipconf.h to the right place (#1366)

dev-libs/libzip/libzip-1.2.0.recipe

@@ -4,7 +4,7 @@ archives."
 HOMEPAGE="http://www.nih.at/libzip/"
 COPYRIGHT="1999-2016 Dieter Baron and Thomas Klausner"
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.nih.at/libzip/libzip-$portVersion.tar.gz"
 CHECKSUM_SHA256="6cf9840e427db96ebf3936665430bab204c9ebbd0120c326459077ed9c907d9f"
 PATCHES="libzip-$portVersion.patchset"
@@ -68,20 +68,15 @@ INSTALL()
 {
 	make install
 
+	# Move zipconf.h from lib/libzip/include/ to develop/headers/
+	mv $libDir/libzip/include/zipconf.h $includeDir
+	rm -rf $libDir/libzip
+
 	rm $libDir/libzip.la
 
 	prepareInstalledDevelLibs libzip
 	fixPkgconfig
 
-	# Move zipconf.h from lib/libzip/include/ to develop/headers/libzip/
-	mkdir -p $includeDir/libzip
-	mv $libDir/libzip/include/zipconf.h $includeDir/libzip
-	rmdir $libDir/libzip/include $libDir/libzip
-
-	# Adjust libincludedir to make it point to where zipconf.h was moved.
-	sed -i -e "s,^\(libincludedir=\)$libDir"'\(/libzip\)/include$,\1${prefix}/'"${relativeIncludeDir}\2," \
-		$developLibDir/pkgconfig/libzip.pc
-
 	if [ -z "$secondaryArchSuffix" ]; then
 		maybe_manDir_man3=$manDir/man3
 	else

dev-libs/libzip/patches/libzip-1.2.0.patchset

@@ -1,14 +1,14 @@
-From 83469244d644593a2ef27f179102b0b4e1975caf Mon Sep 17 00:00:00 2001
+From be479427ac1889da289f0d9ff8ca3ce3443a7eee Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Sat, 28 May 2016 09:50:37 +0000
 Subject: gcc2 patch
 
 
 diff --git a/src/zipcmp.c b/src/zipcmp.c
-index cf9b572..032c838 100644
+index aac1eea..352f2da 100644
 --- a/src/zipcmp.c
 +++ b/src/zipcmp.c
-@@ -313,6 +313,7 @@ list_directory(const char *name, struct archive *a)
+@@ -314,6 +314,7 @@ list_directory(const char *name, struct archive *a)
      FTS *fts;
      FTSENT *ent;
      zip_uint64_t nalloc;
@@ -16,7 +16,7 @@ index cf9b572..032c838 100644
  
      char * const names[2] = { (char *)name, NULL };
  
-@@ -321,7 +322,7 @@ list_directory(const char *name, struct archive *a)
+@@ -322,7 +323,7 @@ list_directory(const char *name, struct archive *a)
  	fprintf(stderr, "%s: can't open directory '%s': %s\n", prg, name, strerror(errno));
  	return -1;
      }
@@ -28,3 +28,26 @@ index cf9b572..032c838 100644
 -- 
 2.7.0
 
+
+From cfede57da3bd091f08ab8810d4cae8c919b56ff0 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 21 May 2017 17:08:44 +0200
+Subject: fix path for libincludedir
+
+
+diff --git a/libzip.pc.in b/libzip.pc.in
+index ef8af2d..4bdf733 100644
+--- a/libzip.pc.in
++++ b/libzip.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-libincludedir=@libdir@/@PACKAGE@/include
++libincludedir=@includedir@
+ 
+ zipcmp=@prefix@/bin/zipcmp
+ 
+-- 
+2.7.0
+