gentoo resync : 18.05.2019

5 files changed, 6 insertions, 87 deletions

diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index b2af77531b26..e7ca74da1726 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,7 +1,4 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
-AUX libfpx-1.3.1_p6-gcc6.patch 840 BLAKE2B 4c9a5535fe452877f4b3e0b3bf2d9923505ce97dfd2f00aad45ef35baf86dfe5a8274bbb37df98bc099fd4adcfbe7f5573b5bb55b28ee0826bce0fd312d140dd SHA512 064e9f0f69bf66a93e6560a680b8680809260f6a4a6811f9568d9ef5230382a60e9bbd76680731434a4cae2570e6dd834ca3fd51e8c356ef949c1cf75f2c5af6
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-DIST libfpx-1.3.1-6.tar.bz2 2358328 BLAKE2B d522d674af92f7a5fe00378a01e743342978290297aea26738e6077834ad8eee6afffd01b16bcec29d729d87383b2123e35a62e9d0da9f1623f79a55b413d9e5 SHA512 d33bc59f091100f4e0f7db396ba2f3a93951b348f8b175070fa23186f7ce488e71b7be43a45ebd9a3af21affe5342f63955df8549ff15582f8b29e67601531fb
-EBUILD libfpx-1.3.1_p10.ebuild 994 BLAKE2B c8ce3f49eb4deb925a33a41ba1a875fa1f4e9a23a95586760de113173b9bcc2a1f0753f2fb1de952d241c4b8de690933899433930a88b168e7cdc0499f60880d SHA512 3db12cf05efc51d9963669de96e317209a48961242a17ef7d8c12d36eb126f3e48572085ae714b666314273d9927b3e4aa0e9540213efb7d4ae4ef44ac0ba447
-EBUILD libfpx-1.3.1_p6.ebuild 1027 BLAKE2B 89c16c6f85e16ce19bcb4a14d6d6fee17b50977344f323a82bf74caed434272df9b2e172dcd50d92de20c78df151fe6ecb74bdce1fa0f34781f10b15d839c597 SHA512 34418eb51824d3250da69eb119295b5785c4020cf05adecb6a04e62481ced8f893cdcdb5ca08e20887ef276a22baac68c0669e020d846e660714b0c025da8fe4
-MISC metadata.xml 343 BLAKE2B 87d81ba8409f0c9ad2be7cc2183ff5b7ec0bac3647f16f28e1e73acd7684de8419968eef18e524aad3a321e3f17403d4b22b762270fab419263ef5c50189ab9c SHA512 beac0e9d9adaa87113df0b38a8779ce67e35c89c54ad0d8e6b4470b82c1f41eb2fe5f2e40425cb039defa03ed7a5fc0d6f41912f6f8b98a98e79882c381d0bae
+EBUILD libfpx-1.3.1_p10.ebuild 1012 BLAKE2B 79976bc1924274587dd60709d3a3446f3c865f16307d5a186e3c78a00030d3391a5109b01ad98eaef296129bd1414e9621dff18614420d2c167a25ef0e92940d SHA512 3ad3ca36f92e7db5aeee0b1107749a0554f6f8e94eca796999bae76dc9be554205a65b60512f416052dd7668b3a124c82f6ef01d30550310733e49855bdbae00
+MISC metadata.xml 430 BLAKE2B 06c7b8d737850306370a49f0d4ff7357a6a97de82bafb26c77f1525fc2b775a6aa03b954167dd7a27213dbbb56bb331cb5140ea4c78aafbd96993987bf998d00 SHA512 c041796d2ed0067ede9168e4212917751f7a7a4fb3463b9ca8343af1e2157cdbbdfaa763fc5b8390179b62b368ff7f098fcdce4e13a74193a34654c06f998f94
diff --git a/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch b/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch
deleted file mode 100644
index 75c7a7efdbd4..000000000000
--- a/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/oless/h/page.hxx
-+++ b/oless/h/page.hxx
-@@ -47,6 +47,7 @@
- {
- public:
-     void * operator new(size_t size, size_t sizeData);
-+    void operator delete(void *ptr);
- 
-     CMSFPage(CMSFPage *pmpNext);
-     inline ~CMSFPage();
-@@ -133,6 +134,24 @@
- }
- 
- //+---------------------------------------------------------------------------
-+//
-+//  Member: CMSFPage::operator delete, public
-+//
-+//  Synopsis: Overloaded delete operator for CMSFPage.
-+//
-+//  Arguments:  [ptr] -- Pointer to CMSFPage object
-+//
-+//----------------------------------------------------------------------------
-+
-+inline void CMSFPage::operator delete(void *ptr)
-+{
-+    if (ptr) {
-+        free(ptr);
-+        ptr = NULL;
-+    }
-+}
-+
-+//+---------------------------------------------------------------------------
- //
- //  Member: CMSFPage::GetNext, public
- //
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 006ee9d4936a..b67400320110 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic libtool
 
 DESCRIPTION="A library for manipulating FlashPIX images"
-HOMEPAGE="http://www.i3a.org/"
+HOMEPAGE="https://github.com/ImageMagick/libfpx"
 SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
diff --git a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
deleted file mode 100644
index 0b259aac38db..000000000000
--- a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="A library for manipulating FlashPIX images"
-HOMEPAGE="http://www.i3a.org/"
-SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
-
-LICENSE="Flashpix"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="static-libs"
-
-S=${WORKDIR}/${P/_p/-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-
-	# we're not windows, even though we don't define __unix by default
-	[[ ${CHOST} == *-darwin* ]] && append-flags -D__unix
-
-	elibtoolize
-}
-
-src_configure() {
-	append-ldflags -Wl,--no-undefined
-	econf \
-		$(use_enable static-libs static) \
-		LIBS="-lstdc++ -lm"
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog doc/*.txt
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/*.pdf
-}
diff --git a/media-libs/libfpx/metadata.xml b/media-libs/libfpx/metadata.xml
index d845d64c112b..7a252f9efc58 100644
--- a/media-libs/libfpx/metadata.xml
+++ b/media-libs/libfpx/metadata.xml
@@ -8,4 +8,7 @@
   <slots>
     <subslots>Reflect major ABI of libfpx.so.</subslots>
   </slots>
+  <upstream>
+    <remote-id type="github">ImageMagick/libfpx</remote-id>
+  </upstream>
 </pkgmetadata>