From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 27 Mar 2021 06:06:27 +0000
Subject: gentoo resync : 27.03.2021

---
 media-libs/partio/Manifest                         |  1 -
 .../files/partio-1.1.0-Rename-partconv.patch       | 65 ----------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 media-libs/partio/files/partio-1.1.0-Rename-partconv.patch

(limited to 'media-libs/partio')

diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index ee9d16cedce1..211b7c96848c 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,4 +1,3 @@
-AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477
 EBUILD partio-1.10.1.ebuild 1016 BLAKE2B f299a2d45d8d7cb384e2036a48a6bbb8052460c341d860d8548b282c27f0a6ed95a0571e7839df7c934a3e83db7abb9161670e79ac63e7bfbce6e9567b88e858 SHA512 5f522ae58b71252dd1da74c73c80ac75bca3d9e97bd4f76dd3c3f152a77254894bba0a193dea97f78341c25a2801fecd031836af0dc82a1e9102e327049960b6
 EBUILD partio-9999.ebuild 1007 BLAKE2B 0ef6f815874a53c90a329598fa1fb74ffbe8df5d54594b4bca6c13de3836c50417f5185e2e6adf84c0ff5111fce8dbc850e5901e33cefb2eb274048dcf4bddc4 SHA512 42c9ce2cb8ac4ae9cf89a3bedcb2e7ff10c7adfe8c7c22cc39ed592f359a8d102ae736321fae802b18e29664c29e9201691ecd402f12e523a5e2b30ce32785d7
diff --git a/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch b/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch
deleted file mode 100644
index 35f7c1244f38..000000000000
--- a/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7042285af5491fd3c2727fa24a7fd44145c066e5 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Sat, 23 Sep 2017 16:43:37 +0100
-Subject: [PATCH] Rename partconv to partconvert to avoid file collisions
-
-* partconv is the name of a program used by Crystal Space
-
-Closes: https://bugs.gentoo.org/631834
----
- README.md                                  | 2 +-
- src/Makefile                               | 2 +-
- src/tools/CMakeLists.txt                   | 6 +++---
- src/tools/{partconv.cpp => partconvert.cpp} | 0
- 4 files changed, 5 insertions(+), 5 deletions(-)
- rename src/tools/{partconv.cpp => partconvert.cpp} (100%)
-
-diff --git a/README.md b/README.md
-index 0a3ac19..4cd12c3 100644
---- a/README.md
-+++ b/README.md
-@@ -56,7 +56,7 @@ src/
-    doc/      Doxygen documentation and (the start of) a manual
-    tests/    Start of regression tests (I need more)
-    tools/    Useful tools 
--             partconv <input format> <output format>
-+             partconvert <input format> <output format>
-              partinfo <particle file>
-              partview <particle file>
- 
-diff --git a/src/Makefile b/src/Makefile
-index 0ced80e..ca4f965 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -25,4 +25,4 @@ reader/BGEO.o: reader/BGEO.cpp Particle.h ParticleSimple.h \
- reader/PDB.o: reader/PDB.cpp Particle.h ParticleSimple.h \
-   reader/../Particle.h reader/pdb.h
- partinfo.o: partinfo.cpp Particle.h
--partconv.o: partconf.cpp Particle.h
-\ No newline at end of file
-+partconvert.o: partconf.cpp Particle.h
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 7a6d26b..b4ed9ae 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -47,10 +47,10 @@ ENDIF(GLUT_FOUND AND OPENGL_FOUND)
- ADD_EXECUTABLE(partinfo partinfo.cpp)
- target_link_libraries(partinfo ${PARTIO_LIBRARIES})
- 
--ADD_EXECUTABLE(partconv partconv.cpp)
--target_link_libraries(partconv ${PARTIO_LIBRARIES})
-+ADD_EXECUTABLE(partconvert partconvert.cpp)
-+target_link_libraries(partconvert ${PARTIO_LIBRARIES})
- 
- ADD_EXECUTABLE(partattr partattr.cpp)
- target_link_libraries(partattr ${PARTIO_LIBRARIES})
- 
--install(TARGETS partattr partconv partinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS partattr partconvert partinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/tools/partconv.cpp b/src/tools/partconvert.cpp
-similarity index 100%
-rename from src/tools/partconv.cpp
-rename to src/tools/partconvert.cpp
--- 
-2.14.1
-
-- 
cgit v1.2.3