From c957ddcd86d90fe39abba5ce0d60baea7200da60 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Fri, 20 Oct 2006 19:03:50 +0000 Subject: old (Portage version: 2.1.2_pre3-r5) (Unsigned Manifest commit) --- app-text/poppler-bindings/Manifest | 33 +------- .../files/digest-poppler-bindings-0.5.1-r1 | 6 -- .../files/poppler-0.5.1-arthur.patch | 52 ------------- .../files/poppler-0.5.1-bindings.patch | 88 ---------------------- .../files/poppler-0.5.1-qt-pthread.patch | 40 ---------- .../files/poppler-0.5.1-r1-bindings.patch | 88 ---------------------- .../poppler-bindings-0.5.1-r1.ebuild | 74 ------------------ 7 files changed, 4 insertions(+), 377 deletions(-) delete mode 100644 app-text/poppler-bindings/files/digest-poppler-bindings-0.5.1-r1 delete mode 100644 app-text/poppler-bindings/files/poppler-0.5.1-arthur.patch delete mode 100644 app-text/poppler-bindings/files/poppler-0.5.1-bindings.patch delete mode 100644 app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch delete mode 100644 app-text/poppler-bindings/files/poppler-0.5.1-r1-bindings.patch delete mode 100644 app-text/poppler-bindings/poppler-bindings-0.5.1-r1.ebuild (limited to 'app-text/poppler-bindings') diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest index cbd62d642348..3ceb5f294ffb 100644 --- a/app-text/poppler-bindings/Manifest +++ b/app-text/poppler-bindings/Manifest @@ -2,34 +2,12 @@ AUX glib-2.0.fix 3794 RMD160 ec38bc7db6896db2d124706201ce1169e2900605 SHA1 54f04 MD5 c8e1183490df063057f55df4e7e32727 files/glib-2.0.fix 3794 RMD160 ec38bc7db6896db2d124706201ce1169e2900605 files/glib-2.0.fix 3794 SHA256 6ce30931b31eb49095a1420b6fc1a15e02a726e1ec7b490460587939bbef9e16 files/glib-2.0.fix 3794 -AUX poppler-0.5.1-arthur.patch 1420 RMD160 24628ffec2d19f251c9901ce4fd102a6260febd3 SHA1 cadd6f58a15ca63d71ac94cd25a5d084363c0eb2 SHA256 f25d0dda38ec392923c6de2835635b9a5dc9599cad5aad35e0e7fea2704cbd98 -MD5 96d36c0ffd0b851de5501a7a6f754ba6 files/poppler-0.5.1-arthur.patch 1420 -RMD160 24628ffec2d19f251c9901ce4fd102a6260febd3 files/poppler-0.5.1-arthur.patch 1420 -SHA256 f25d0dda38ec392923c6de2835635b9a5dc9599cad5aad35e0e7fea2704cbd98 files/poppler-0.5.1-arthur.patch 1420 -AUX poppler-0.5.1-bindings.patch 3014 RMD160 deab225ad3c9a0f719784f38e6f734e2825ec875 SHA1 3847cf4111ceb493ebdd49f7f5c07ede0f282715 SHA256 18a89c526341019d44ca0054b0b6f54a8c903b05d0bec69a94d2a72a2897d68f -MD5 446d870c27304d4bdef6fca86e9bb624 files/poppler-0.5.1-bindings.patch 3014 -RMD160 deab225ad3c9a0f719784f38e6f734e2825ec875 files/poppler-0.5.1-bindings.patch 3014 -SHA256 18a89c526341019d44ca0054b0b6f54a8c903b05d0bec69a94d2a72a2897d68f files/poppler-0.5.1-bindings.patch 3014 -AUX poppler-0.5.1-qt-pthread.patch 1247 RMD160 f5c2b8b25ba217f8f6596140a89446cd6a37c52f SHA1 c493a7bc9e9b94f159e133670c0f1328e34d52d7 SHA256 99296e73696786df70809700d7019c5b0135ad2ec806e16658b77335b183daa7 -MD5 e83dc2fe447e9b661c680dc176ce1c01 files/poppler-0.5.1-qt-pthread.patch 1247 -RMD160 f5c2b8b25ba217f8f6596140a89446cd6a37c52f files/poppler-0.5.1-qt-pthread.patch 1247 -SHA256 99296e73696786df70809700d7019c5b0135ad2ec806e16658b77335b183daa7 files/poppler-0.5.1-qt-pthread.patch 1247 -AUX poppler-0.5.1-r1-bindings.patch 2982 RMD160 07ee852dd5988822886be6bebf1431f9e69b66e2 SHA1 9d6ce016f3ed7a43545608d42092806bd1dfad67 SHA256 32dfeb415c242b67f67c4934b7d725f18296d56af90a84f4a3d6b3862298c175 -MD5 dd9bbe42d7cb066d25d0bc67a019581f files/poppler-0.5.1-r1-bindings.patch 2982 -RMD160 07ee852dd5988822886be6bebf1431f9e69b66e2 files/poppler-0.5.1-r1-bindings.patch 2982 -SHA256 32dfeb415c242b67f67c4934b7d725f18296d56af90a84f4a3d6b3862298c175 files/poppler-0.5.1-r1-bindings.patch 2982 AUX poppler-0.5.2-bindings.patch 2981 RMD160 3cd602de04e21b16ad2d72e43ac497f2096e9407 SHA1 5fada87381a777eed18bf2db8c2f74c66769f2db SHA256 fddf8730871743ca6bb3cf210f9444b7b5de4704d68b383ddc982ef9e2ff9ffc MD5 fd7f0254cdc14aa17e517b17c4500d15 files/poppler-0.5.2-bindings.patch 2981 RMD160 3cd602de04e21b16ad2d72e43ac497f2096e9407 files/poppler-0.5.2-bindings.patch 2981 SHA256 fddf8730871743ca6bb3cf210f9444b7b5de4704d68b383ddc982ef9e2ff9ffc files/poppler-0.5.2-bindings.patch 2981 -DIST poppler-0.5.1-cvs20060401.patch.bz2 41297 RMD160 35659844e017eeacf16da6172377b8e144201b61 SHA1 e3957986c7b5ab20ae95839479f8d3b7d23d2cdc SHA256 56e1c52451a14c2d6eba7f55eece60102e2ee5dd2fb24aeb18e584d0109cf027 -DIST poppler-0.5.1.tar.gz 954930 RMD160 ffd39323da0e0c487a6e7de48d8a607385189ddd SHA1 8d654a0f8eb6ad8c8cb08ced24a06f1f5b13c711 SHA256 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe DIST poppler-0.5.3.tar.gz 1049900 RMD160 3456de23955fc4001842c76d32deba308bd7f968 SHA1 e197f5cf56f0676b5ca313577dd6456a393c46ec SHA256 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190 DIST poppler-0.5.4.tar.gz 1062401 RMD160 f28c89b03388757067505df3c60a1d878626b0dd SHA1 edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1 SHA256 ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9 -EBUILD poppler-bindings-0.5.1-r1.ebuild 1970 RMD160 a2bed375e649ac40254dbb7735114d1078a3945d SHA1 c6ab99dd276999c2a644be8ab375454676ace409 SHA256 c05d77942a0791cc9fea9c8fbc40ad798e3b0f11fe36d4698a977b503adc461e -MD5 fc5d1ab9eb9d63db07907b360b3a9d69 poppler-bindings-0.5.1-r1.ebuild 1970 -RMD160 a2bed375e649ac40254dbb7735114d1078a3945d poppler-bindings-0.5.1-r1.ebuild 1970 -SHA256 c05d77942a0791cc9fea9c8fbc40ad798e3b0f11fe36d4698a977b503adc461e poppler-bindings-0.5.1-r1.ebuild 1970 EBUILD poppler-bindings-0.5.3.ebuild 1740 RMD160 93802bd321d596e6d2bb8c809987453ec8a3d332 SHA1 5943ab0b6c580a54d01665040693d222810a7f56 SHA256 3f42482d5fa50a598383320394efd632b9da1aae072862c7bcbb3bac475983cf MD5 df2efd9280c1c3148170a568119578c9 poppler-bindings-0.5.3.ebuild 1740 RMD160 93802bd321d596e6d2bb8c809987453ec8a3d332 poppler-bindings-0.5.3.ebuild 1740 @@ -38,17 +16,14 @@ EBUILD poppler-bindings-0.5.4.ebuild 1784 RMD160 d236acea7b6227a8536a66f196e42d9 MD5 fe8ba001f00b911906ecb404a246985c poppler-bindings-0.5.4.ebuild 1784 RMD160 d236acea7b6227a8536a66f196e42d946690dbac poppler-bindings-0.5.4.ebuild 1784 SHA256 3764bff5e1e7f2970f089df991034efba6beed00243d0202981adaae58fbcd81 poppler-bindings-0.5.4.ebuild 1784 -MISC ChangeLog 7934 RMD160 18c292e939e5746a543e9d508ce24db74a214855 SHA1 4583bcb2b19ce140d9efc646556fbef3c07eeb8a SHA256 40b9b103354c7e946eada5ebdcfc9cbb5e1cd49314ed41a0b7ac3a4e5b1ca010 -MD5 e38a7c8e71c85ae469494fff4fa67c51 ChangeLog 7934 -RMD160 18c292e939e5746a543e9d508ce24db74a214855 ChangeLog 7934 -SHA256 40b9b103354c7e946eada5ebdcfc9cbb5e1cd49314ed41a0b7ac3a4e5b1ca010 ChangeLog 7934 +MISC ChangeLog 8187 RMD160 e91a5f6b6a078146dbbc4f6f31603eeeb2903802 SHA1 8bf452b95b8513a877213bd49804405226a3cdcf SHA256 ab2ec71c84255a6b2023a8ede9bc4329454017d85fbcb40a5be02369793f2a97 +MD5 91df7d9f0499e1d06c799449a8207e45 ChangeLog 8187 +RMD160 e91a5f6b6a078146dbbc4f6f31603eeeb2903802 ChangeLog 8187 +SHA256 ab2ec71c84255a6b2023a8ede9bc4329454017d85fbcb40a5be02369793f2a97 ChangeLog 8187 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161 -MD5 536189ff37491801ccc8e97791212f95 files/digest-poppler-bindings-0.5.1-r1 524 -RMD160 44cded8464779364da3b5fbd4966d442fb96a244 files/digest-poppler-bindings-0.5.1-r1 524 -SHA256 a1bc0d718cd6203e4849066bcee67f97b04e8dcb80a354029daf2124a84500a7 files/digest-poppler-bindings-0.5.1-r1 524 MD5 8a467c13f2ef997d1dad2474d228a34a files/digest-poppler-bindings-0.5.3 244 RMD160 f27d8632aeeb2074f6413c073de4a02b681a7e30 files/digest-poppler-bindings-0.5.3 244 SHA256 3465787c7cf301f676c9414533f5246317d1f36cde135a80d9996c4ff2d3ba3e files/digest-poppler-bindings-0.5.3 244 diff --git a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.1-r1 b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.1-r1 deleted file mode 100644 index 2350d35c34ef..000000000000 --- a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.1-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 1ce8b61d6b91463dc2790b3eff1b1ec7 poppler-0.5.1-cvs20060401.patch.bz2 41297 -RMD160 35659844e017eeacf16da6172377b8e144201b61 poppler-0.5.1-cvs20060401.patch.bz2 41297 -SHA256 56e1c52451a14c2d6eba7f55eece60102e2ee5dd2fb24aeb18e584d0109cf027 poppler-0.5.1-cvs20060401.patch.bz2 41297 -MD5 a136cd731892f4570933034ba97c8704 poppler-0.5.1.tar.gz 954930 -RMD160 ffd39323da0e0c487a6e7de48d8a607385189ddd poppler-0.5.1.tar.gz 954930 -SHA256 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe poppler-0.5.1.tar.gz 954930 diff --git a/app-text/poppler-bindings/files/poppler-0.5.1-arthur.patch b/app-text/poppler-bindings/files/poppler-0.5.1-arthur.patch deleted file mode 100644 index 54fb172b9e25..000000000000 --- a/app-text/poppler-bindings/files/poppler-0.5.1-arthur.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -ur poppler.orig/poppler/Makefile.am poppler/poppler/Makefile.am ---- poppler.orig/poppler/Makefile.am 2006-04-01 17:30:36.000000000 +0200 -+++ poppler/poppler/Makefile.am 2006-04-01 17:35:23.000000000 +0200 -@@ -17,10 +17,10 @@ - - if BUILD_POPPLER_QT4 - --arthur_headers = \ -- ArthurOutputDev.h -+poppler_arthur = libpoppler-arthur.la - --arthur_sources = \ -+libpoppler_arthur_la_SOURCES = \ -+ ArthurOutputDev.h \ - ArthurOutputDev.cc - - arthur_includes = \ -@@ -79,13 +79,13 @@ - - lib_LTLIBRARIES = libpoppler.la - --noinst_LTLIBRARIES = $(poppler_cairo) -+noinst_LTLIBRARIES = $(poppler_cairo) \ -+ $(poppler_arthur) - - libpoppler_la_LIBADD = \ - $(top_builddir)/goo/libgoo.la \ - $(top_builddir)/fofi/libfofi.la \ - $(splash_libs) \ -- $(arthur_libs) \ - $(libjpeg_libs) \ - $(zlib_libs) \ - $(FREETYPE_LIBS) -@@ -97,7 +97,6 @@ - poppler_includedir = $(includedir)/poppler - poppler_include_HEADERS = \ - $(splash_headers) \ -- $(arthur_headers) \ - Annot.h \ - Array.h \ - BaseFile.h \ -diff -ur poppler.orig/qt4/src/Makefile.am poppler/qt4/src/Makefile.am ---- poppler.orig/qt4/src/Makefile.am 2006-04-01 17:41:02.000000000 +0200 -+++ poppler/qt4/src/Makefile.am 2006-04-01 17:40:49.000000000 +0200 -@@ -24,6 +24,7 @@ - - libpoppler_qt4_la_LIBADD = \ - -lpoppler \ -+ $(top_builddir)/poppler/libpoppler-arthur.la \ - $(POPPLER_QT4_LIBS) - - libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0 diff --git a/app-text/poppler-bindings/files/poppler-0.5.1-bindings.patch b/app-text/poppler-bindings/files/poppler-0.5.1-bindings.patch deleted file mode 100644 index a8b75f882dea..000000000000 --- a/app-text/poppler-bindings/files/poppler-0.5.1-bindings.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/glib/Makefile.am poppler-0.5.1/glib/Makefile.am ---- poppler-0.5.1.orig/glib/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/glib/Makefile.am 2006-03-03 19:38:15.000000000 +0100 -@@ -78,7 +78,7 @@ - poppler-private.h - - libpoppler_glib_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ -@@ -92,7 +92,7 @@ - test-poppler-glib.c - - test_poppler_glib_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - libpoppler-glib.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/Makefile.am poppler-0.5.1/Makefile.am ---- poppler-0.5.1.orig/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -29,7 +29,7 @@ - utils_subdir = utils - endif - --SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) -+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir) - - EXTRA_DIST = \ - README-XPDF \ -@@ -40,9 +40,7 @@ - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = \ -- poppler.pc \ - $(cairo_pc_file) \ -- $(splash_pc_file) \ - $(glib_pc_file) \ - $(qt_pc_file) \ - $(qt4_pc_file) -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt/Makefile.am poppler-0.5.1/qt/Makefile.am ---- poppler-0.5.1.orig/qt/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/qt/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -22,7 +22,7 @@ - poppler-private.h - - libpoppler_qt_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) - -@@ -38,7 +38,7 @@ - test-poppler-qt.cpp - - test_poppler_qt_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - libpoppler-qt.la \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt4/src/Makefile.am poppler-0.5.1/qt4/src/Makefile.am ---- poppler-0.5.1.orig/qt4/src/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/qt4/src/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -23,7 +23,7 @@ - poppler-private.h - - libpoppler_qt4_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT4_LIBS) - - libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0 -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt4/tests/Makefile.am poppler-0.5.1/qt4/tests/Makefile.am ---- poppler-0.5.1.orig/qt4/tests/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/qt4/tests/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -7,7 +7,7 @@ - $(POPPLER_QTTEST_CXXFLAGS) - - LDADDS = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/qt4/src/libpoppler-qt4.la \ - $(POPPLER_QT4_LIBS) - diff --git a/app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch b/app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch deleted file mode 100644 index 4589f4b634a1..000000000000 --- a/app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: poppler-0.5.1/m4/qt.m4 -=================================================================== ---- poppler-0.5.1.orig/m4/qt.m4 -+++ poppler-0.5.1/m4/qt.m4 -@@ -53,8 +53,34 @@ if test "x$qt_libdir" != "xno" ; then - fi - - if test "x$have_qt" == "xyes"; then -+ AC_LANG_PUSH([C++]) -+ pthread_needed=no -+ -+ save_LDFLAGS=$LDFLAGS -+ save_CXXFLAGS=$CXXFLAGS -+ save_LIBS=$LIBS -+ CXXFLAGS="$CXXFLAGS -I$qt_incdir" -+ LIBS="$LIBS $qt_libdir/$qt_test_library" -+ AC_MSG_CHECKING([if Qt needs -pthread]) -+ AC_TRY_LINK([#include ], [QString s;], [pthread_needed=no], [pthread_needed=yes]) -+ if test "x$pthread_needed" = "xyes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ AC_TRY_LINK([#include ], [QString s;], [pthread_needed=yes], [pthread_needed=no]) -+ fi -+ AC_MSG_RESULT([$pthread_needed]) -+ LDFLAGS=$save_LDFLAGS -+ CXXFLAGS=$save_CXXFLAGS -+ LIBS=$save_LIBS -+ -+ AC_LANG_POP -+ -+ qtpthread='' -+ if test "x$pthread_needed" = "xyes"; then -+ qtpthread="-pthread" -+ fi -+ - $1[]_CXXFLAGS="-I$qt_incdir" -- $1[]_LIBS="$qt_libdir/$qt_test_library" -+ $1[]_LIBS="$qtpthread $qt_libdir/$qt_test_library" - ifelse([$2], , :, [$2]) - else - ifelse([$3], , [AC_MSG_FAILURE(dnl diff --git a/app-text/poppler-bindings/files/poppler-0.5.1-r1-bindings.patch b/app-text/poppler-bindings/files/poppler-0.5.1-r1-bindings.patch deleted file mode 100644 index d3cb8996ef93..000000000000 --- a/app-text/poppler-bindings/files/poppler-0.5.1-r1-bindings.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/glib/Makefile.am poppler-0.5.1/glib/Makefile.am ---- poppler-0.5.1.orig/glib/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/glib/Makefile.am 2006-03-03 19:38:15.000000000 +0100 -@@ -79,7 +79,7 @@ - poppler-private.h - - libpoppler_glib_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ - $(cairo_libs) -@@ -92,7 +92,7 @@ - test-poppler-glib.c - - test_poppler_glib_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - libpoppler-glib.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/Makefile.am poppler-0.5.1/Makefile.am ---- poppler-0.5.1.orig/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -29,7 +29,7 @@ - utils_subdir = utils - endif - --SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) -+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir) - - EXTRA_DIST = \ - README-XPDF \ -@@ -40,9 +40,7 @@ - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = \ -- poppler.pc \ - $(cairo_pc_file) \ -- $(splash_pc_file) \ - $(glib_pc_file) \ - $(qt_pc_file) \ - $(qt4_pc_file) -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt/Makefile.am poppler-0.5.1/qt/Makefile.am ---- poppler-0.5.1.orig/qt/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/qt/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -22,7 +22,7 @@ - poppler-private.h - - libpoppler_qt_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) - -@@ -38,7 +38,7 @@ - test-poppler-qt.cpp - - test_poppler_qt_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - libpoppler-qt.la \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt4/src/Makefile.am poppler-0.5.1/qt4/src/Makefile.am ---- poppler-0.5.1.orig/qt4/src/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/qt4/src/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -23,7 +23,7 @@ - poppler-private.h - - libpoppler_qt4_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT4_LIBS) - - libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0 -diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt4/tests/Makefile.am poppler-0.5.1/qt4/tests/Makefile.am ---- poppler-0.5.1.orig/qt4/tests/Makefile.am 2006-03-03 19:37:27.000000000 +0100 -+++ poppler-0.5.1/qt4/tests/Makefile.am 2006-03-03 19:37:33.000000000 +0100 -@@ -7,7 +7,7 @@ - $(POPPLER_QTTEST_CXXFLAGS) - - LDADDS = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/qt4/src/libpoppler-qt4.la \ - $(POPPLER_QT4_LIBS) - diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.1-r1.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.1-r1.ebuild deleted file mode 100644 index 9d529cd5a12c..000000000000 --- a/app-text/poppler-bindings/poppler-bindings-0.5.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.1-r1.ebuild,v 1.12 2006/07/22 15:59:41 tcort Exp $ - -inherit autotools eutils multilib - -MY_P=${P/-bindings/} -DESCRIPTION="Poppler bindings are rendering bindings for GUI toolkits for poppler" -HOMEPAGE="http://poppler.freedesktop.org" -SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz - http://dev.gentoo.org/~genstef/files/dist/${MY_P}-cvs20060401.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="gtk qt3 cairo qt4" - -RDEPEND="~app-text/poppler-${PV} - cairo? ( >=x11-libs/cairo-0.5 ) - gtk? ( - >=x11-libs/gtk+-2.6 - >=gnome-base/libglade-2 - ) - qt3? ( =x11-libs/qt-3* ) - qt4? ( =x11-libs/qt-4* )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/automake-1.9.6" - -S="${WORKDIR}/${MY_P}" - -src_unpack(){ - unpack ${A} - cd ${S} - epatch ${WORKDIR}/${MY_P}-cvs20060401.patch - epatch ${FILESDIR}/${MY_P}-r1-bindings.patch - epatch ${FILESDIR}/${MY_P}-arthur.patch - - epatch "${FILESDIR}/${MY_P}-qt-pthread.patch" - - AT_M4DIR="m4" eautoreconf - sed -i s:/usr/lib/qt:/usr/lib/qt4: configure -} - -src_compile() { - # Configure needs help finding qt libs on multilib systems - export QTLIB="${QTDIR}/$(get_libdir)" - - econf --enable-opi \ - $(use_enable cairo cairo-output) \ - $(use_enable gtk poppler-glib) \ - $(use_enable qt3 poppler-qt) \ - $(use_enable qt4 poppler-qt4) \ - || die "configuration failed" - cd poppler - if use cairo; then - emake libpoppler-cairo.la || die "cairo failed" - fi - if use qt4; then - emake libpoppler-arthur.la || die "arthur failed" - fi - cd .. - emake || die "compilation failed" -} - -src_install() { - dolib.a poppler/libpoppler-cairo.la - make DESTDIR=${D} install || die "make install failed" -} - -pkg_postinst() { - ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild" -} -- cgit v1.2.3-65-gdbad