From 34d4c9fc1d4e4b7be35c2949c1a70f2f64dbf686 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 12 Jan 2022 02:08:18 +0100
Subject: [PATCH] poppler-data, bump version, remove old (#6510)

---
 ...4.10.recipe => poppler_data-0.4.11.recipe} | 12 ++---
 .../poppler_data/poppler_data-0.4.8.recipe    | 45 -------------------
 .../poppler_data/poppler_data-0.4.9.recipe    | 42 -----------------
 3 files changed, 7 insertions(+), 92 deletions(-)
 rename app-text/poppler_data/{poppler_data-0.4.10.recipe => poppler_data-0.4.11.recipe} (75%)
 delete mode 100644 app-text/poppler_data/poppler_data-0.4.8.recipe
 delete mode 100644 app-text/poppler_data/poppler_data-0.4.9.recipe

diff --git a/app-text/poppler_data/poppler_data-0.4.10.recipe b/app-text/poppler_data/poppler_data-0.4.11.recipe
similarity index 75%
rename from app-text/poppler_data/poppler_data-0.4.10.recipe
rename to app-text/poppler_data/poppler_data-0.4.11.recipe
index 077ad2341..5c13a35a1 100644
--- a/app-text/poppler_data/poppler_data-0.4.10.recipe
+++ b/app-text/poppler_data/poppler_data-0.4.11.recipe
@@ -2,13 +2,16 @@ SUMMARY="A PDF rendering library (datafiles)"
 DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code \
 base. This package consists of encoding files for use with poppler."
 HOMEPAGE="https://poppler.freedesktop.org/"
-COPYRIGHT="2002-2008 Albert Astals Cid
+COPYRIGHT="1990-2019 Adobe
+	2002-2008 Albert Astals Cid
 	2005 Kristian Høgsberg
 	2001-2002 Derek Noonburg (xpdf)"
-LICENSE="GNU GPL v2"
+LICENSE="BSD (3-clause)
+	GNU GPL v2
+	MIT"
 REVISION="1"
 SOURCE_URI="https://poppler.freedesktop.org/poppler-data-$portVersion.tar.gz"
-CHECKSUM_SHA256="6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"
+CHECKSUM_SHA256="2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"
 SOURCE_DIR="poppler-data-$portVersion"
 
 ARCHITECTURES="any"
@@ -37,6 +40,5 @@ BUILD()
 
 INSTALL()
 {
-	make datadir=$libDir pkgdatadir=$dataDir install
-	fixPkgconfig
+	make datadir=$dataDir pkgdatadir=$dataDir install
 }
diff --git a/app-text/poppler_data/poppler_data-0.4.8.recipe b/app-text/poppler_data/poppler_data-0.4.8.recipe
deleted file mode 100644
index 09ae19b05..000000000
--- a/app-text/poppler_data/poppler_data-0.4.8.recipe
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY="A PDF rendering library (datafiles)"
-DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code \
-base. This package consists of encoding files for use with poppler."
-HOMEPAGE="https://poppler.freedesktop.org/"
-COPYRIGHT="2002-2008 Albert Astals Cid
-	2005 Kristian Høgsberg
-	2001-2002 Derek Noonburg (xpdf)"
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://poppler.freedesktop.org/poppler-data-$portVersion.tar.gz"
-CHECKSUM_SHA256="1096a18161f263cccdc6d8a2eb5548c41ff8fcf9a3609243f1b6296abdf72872"
-SOURCE_DIR="poppler-data-$portVersion"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	$portName = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:install
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
-	"
-
-BUILD()
-{
-	true
-}
-
-INSTALL()
-{
-	make datadir=$libDir pkgdatadir=$dataDir install
-
-	#mv $dataDir/pkgconfig $libDir
-
-	fixPkgconfig
-}
diff --git a/app-text/poppler_data/poppler_data-0.4.9.recipe b/app-text/poppler_data/poppler_data-0.4.9.recipe
deleted file mode 100644
index 8f3d2bd95..000000000
--- a/app-text/poppler_data/poppler_data-0.4.9.recipe
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY="A PDF rendering library (datafiles)"
-DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code \
-base. This package consists of encoding files for use with poppler."
-HOMEPAGE="https://poppler.freedesktop.org/"
-COPYRIGHT="2002-2008 Albert Astals Cid
-	2005 Kristian Høgsberg
-	2001-2002 Derek Noonburg (xpdf)"
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://poppler.freedesktop.org/poppler-data-$portVersion.tar.gz"
-CHECKSUM_SHA256="1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012"
-SOURCE_DIR="poppler-data-$portVersion"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	$portName = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:install
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
-	"
-
-BUILD()
-{
-	true
-}
-
-INSTALL()
-{
-	make datadir=$libDir pkgdatadir=$dataDir install
-	fixPkgconfig
-}