New revision. Rework ebuild to be less repetitive and more readable. Remove mozilla USE flag since mozilla will masked soon. Fix for multilib-strict (bug #127145).

(Portage version: 2.1.1_pre2-r8)

2 files changed, 99 insertions, 0 deletions

diff --git a/media-video/gpac/files/digest-gpac-0.4.1_pre20060122-r1 b/media-video/gpac/files/digest-gpac-0.4.1_pre20060122-r1
new file mode 100644
index 000000000000..fc220572b526
--- /dev/null
+++ b/media-video/gpac/files/digest-gpac-0.4.1_pre20060122-r1
@@ -0,0 +1,3 @@
+MD5 db0f93078d76b4b2d9c7c80dc050a218 gpac-0.4.1_pre20060122.tar.bz2 2455736
+RMD160 9bf7f5e26255edf843b5ad02e86ecd8e1740a4b4 gpac-0.4.1_pre20060122.tar.bz2 2455736
+SHA256 ff543380a2408b28df00d91611a0004ca88540af01f23a4bdc4f87eba64b531a gpac-0.4.1_pre20060122.tar.bz2 2455736
diff --git a/media-video/gpac/files/gpac-0.4.1_pre20060122-DESTDIR.patch b/media-video/gpac/files/gpac-0.4.1_pre20060122-DESTDIR.patch
new file mode 100644
index 000000000000..6259ac22c9f7
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.1_pre20060122-DESTDIR.patch
@@ -0,0 +1,96 @@
+diff -ur gpac.orig/Makefile gpac/Makefile
+--- gpac.orig/Makefile	2006-07-13 16:17:01.000000000 -0400
++++ gpac/Makefile	2006-07-13 16:17:07.000000000 -0400
+@@ -53,14 +53,14 @@
+ 	( tar zcvf ~/$(FILE).tar.gz ../gpac --exclude CVS --exclude bin --exclude lib --exclude Obj --exclude temp --exclude amr_nb --exclude amr_nb_ft --exclude amr_wb_ft --exclude *.mak --exclude *.o --exclude *.~*)
+ 
+ install:
+-	install -d "$(prefix)/bin"
+-	install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(prefix)/bin"
+-	install $(INSTFLAGS) -m 755 bin/gcc/MP42Avi "$(prefix)/bin"
++	install -d "$(DESTDIR)$(prefix)/bin"
++	install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin"
++	install $(INSTFLAGS) -m 755 bin/gcc/MP42Avi "$(DESTDIR)$(prefix)/bin"
+ 	$(MAKE) -C applications install
+-	install -d "$(moddir)"
+-	install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)"
+-	rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX)
+-	rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
++	install -d "$(DESTDIR)$(moddir)"
++	install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
++	rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
++	rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib
+ else
+@@ -71,16 +71,15 @@
+ 	install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+ 	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
+ else
+-	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+-	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
+-	ldconfig || true
++	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)"
++	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) "$(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)"
+ endif
+ endif
+-	install -d "$(mandir)/man1"
+-	install -m 644 doc/man/mp4box.1 $(mandir)/man1/
+-	install -m 644 doc/man/mp42avi.1 $(mandir)/man1/
+-	install -m 644 doc/man/mp4client.1 $(mandir)/man1/
+-	install -m 644 doc/man/gpac.1 $(mandir)/man1/
++	install -d "$(DESTDIR)$(mandir)/man1"
++	install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
++	install -m 644 doc/man/mp42avi.1 $(DESTDIR)$(mandir)/man1/
++	install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
++	install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
+ 
+ uninstall:
+ 	$(MAKE) -C applications uninstall
+@@ -95,14 +94,14 @@
+ 	rm -rf $(mandir)/man1/gpac.1
+ 
+ install-lib:
+-	mkdir -p "$(prefix)/include/gpac"
+-	install -m 644 $(SRC_PATH)/include/gpac/*.h "$(prefix)/include/gpac"
+-	mkdir -p "$(prefix)/include/gpac/internal" 
+-	install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(prefix)/include/gpac/internal"
+-	mkdir -p "$(prefix)/include/gpac/modules" 
+-	install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(prefix)/include/gpac/modules"
+-	mkdir -p "$(prefix)/lib"
+-	install -m 644 "./bin/gcc/libgpac_static.a" "$(prefix)/lib"
++	mkdir -p "$(DESTDIR)$(prefix)/include/gpac"
++	install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac"
++	mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal" 
++	install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal"
++	mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules" 
++	install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
++	mkdir -p "$(DESTDIR)$(prefix)/lib"
++	install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib"
+ 
+ uninstall-lib:
+ 	rm -rf "$(prefix)/include/gpac/internal"
+diff -ur gpac.orig/applications/mp4client/Makefile gpac/applications/mp4client/Makefile
+--- gpac.orig/applications/mp4client/Makefile	2006-07-13 16:17:01.000000000 -0400
++++ gpac/applications/mp4client/Makefile	2006-07-13 16:17:07.000000000 -0400
+@@ -41,7 +41,7 @@
+ 
+ install: clean
+ 	make -override BUILD_INSTALL=yes all
+-	install -c -s -m 755 ../../bin/gcc/MP4Client "$(prefix)/bin"
++	install -c -s -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
+ 
+ uninstall:
+ 	rm -rf $(prefix)/bin/MP4Client
+diff -ur gpac.orig/applications/osmo4_wx/Makefile gpac/applications/osmo4_wx/Makefile
+--- gpac.orig/applications/osmo4_wx/Makefile	2006-07-13 16:17:01.000000000 -0400
++++ gpac/applications/osmo4_wx/Makefile	2006-07-13 16:17:07.000000000 -0400
+@@ -56,7 +56,7 @@
+ else
+ 	rm -f wxOsmo4.o
+ 	make -override BUILD_INSTALL=yes all
+-	install -c -s -m 755 ../../bin/gcc/Osmo4 "$(prefix)/bin"
++	install -c -s -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
+ endif
+ 
+ uninstall: