gentoo resync : 06.05.2018

2 files changed, 0 insertions, 71 deletions

diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
deleted file mode 100644
index 272dcc010819..000000000000
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/aacskeys.make
-+++ b/aacskeys.make
-@@ -13,12 +13,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/Release
-   OUTDIR := bin/linux
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/local/ssl/include"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Wall -fomit-frame-pointer -O3 -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/ssl/include"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -s -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -I "/usr/local/ssl/include"
-+  RESFLAGS := -D "_REENTRANT" -I "/usr/ssl/include"
-   TARGET := aacskeys
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
-@@ -28,12 +28,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/Debug
-   OUTDIR := bin/linux/debug
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -Wall -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g
-   CXXFLAGS := $(CFLAGS)
-   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/local/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
-+  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
-   TARGET := aacskeys
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
deleted file mode 100644
index 2d5e6cc2431a..000000000000
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/libaacskeys.make
-+++ b/libaacskeys.make
-@@ -13,12 +13,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/ReleaseLib
-   OUTDIR := lib/linux
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Wall -fomit-frame-pointer -O3 -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-   TARGET := libaacskeys.so
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
-@@ -28,12 +28,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/DebugLib
-   OUTDIR := lib/linux/debug
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g -Wall -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-   TARGET := libaacskeys.so
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif