summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2007-12-02 00:58:20 +0000
committerWulf Krueger <philantrop@gentoo.org>2007-12-02 00:58:20 +0000
commit39a5d9df5955fa482c2af8c9684a1e78dc8c893b (patch)
tree4d15d2e1e2a518553d706d21b1b6c8d23be27a39 /media-gfx/kphotoalbum
parentx11-apps/ati-drivers-extra needs masked x11-drivers/ati-drivers (diff)
downloadhistorical-39a5d9df5955fa482c2af8c9684a1e78dc8c893b.tar.gz
historical-39a5d9df5955fa482c2af8c9684a1e78dc8c893b.tar.bz2
historical-39a5d9df5955fa482c2af8c9684a1e78dc8c893b.zip
Version bump as per bug 200378. Removed obsolete versions.
Package-Manager: portage-2.1.4_rc4
Diffstat (limited to 'media-gfx/kphotoalbum')
-rw-r--r--media-gfx/kphotoalbum/ChangeLog10
-rw-r--r--media-gfx/kphotoalbum/Manifest43
-rw-r--r--media-gfx/kphotoalbum/files/digest-kphotoalbum-2.23
-rw-r--r--media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.13
-rw-r--r--media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.23
-rw-r--r--media-gfx/kphotoalbum/files/digest-kphotoalbum-3.1.03
-rw-r--r--media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch146
-rw-r--r--media-gfx/kphotoalbum/kphotoalbum-2.2.ebuild47
-rw-r--r--media-gfx/kphotoalbum/kphotoalbum-3.0.1.ebuild60
-rw-r--r--media-gfx/kphotoalbum/kphotoalbum-3.0.2.ebuild60
-rw-r--r--media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild92
11 files changed, 266 insertions, 204 deletions
diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index c6a478966696..56557beab8c6 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-gfx/kphotoalbum
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.19 2007/06/17 14:26:02 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.20 2007/12/02 00:58:19 philantrop Exp $
+
+*kphotoalbum-3.1.0 (02 Dec 2007)
+
+ 02 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/kphotoalbum-3.1.0-exiv2.patch, -kphotoalbum-2.2.ebuild,
+ -kphotoalbum-3.0.1.ebuild, -kphotoalbum-3.0.2.ebuild,
+ +kphotoalbum-3.1.0.ebuild:
+ Version bump as per bug 200378. Removed obsolete versions.
*kphotoalbum-3.0.2-r1 (17 Jun 2007)
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 732b66d48a29..d77e47da89a9 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,47 +1,36 @@
-DIST kphotoalbum-2.2.tar.bz2 11724907 RMD160 c452913487b73834c8bc0e4d66da9008b584f100 SHA1 cdcb9acf8bdbeed4acf3acf17627d1625174146e SHA256 2ab9a186d1d3823c6fba418560701f37ad7af88d65aea6084b864cebff91e911
-DIST kphotoalbum-3.0.1.tar.bz2 15485953 RMD160 d89ce616791df99c684dbb71ee07e559af91ffbf SHA1 5455519a07de3801e3e81b175977f2e7898b46e4 SHA256 5e55a8bfbd7b210ff5cab70df41c9b415242baedc0e3adc0fa137b86be725617
+AUX kphotoalbum-3.1.0-exiv2.patch 5044 RMD160 757b71a9cb299edc8341c66fff75d65823402857 SHA1 2ca7313318b6d743771b32ba01a6b6d8ba2261d3 SHA256 ae8046cdf2c3e512707552d73f3d15e9980cc1a2e13a3f2046bd3580d23d2689
+MD5 0d312022eaf7e918d07e4e83689c299f files/kphotoalbum-3.1.0-exiv2.patch 5044
+RMD160 757b71a9cb299edc8341c66fff75d65823402857 files/kphotoalbum-3.1.0-exiv2.patch 5044
+SHA256 ae8046cdf2c3e512707552d73f3d15e9980cc1a2e13a3f2046bd3580d23d2689 files/kphotoalbum-3.1.0-exiv2.patch 5044
DIST kphotoalbum-3.0.2.tar.bz2 15487681 RMD160 05d986cb7b701730bdd6f93ab8c5fabe1b858ed3 SHA1 1e2737390e742461adce1e86dce1a464f589287b SHA256 bdf06c6398666b071ec4fe91cdae10b5fc949299b13b4d5897690161e625f499
DIST kphotoalbum-3.0.tar.bz2 13103203 RMD160 8d8b3d61cf7b3f2e847bb68a79dbebf38df0b160 SHA1 1c39462ca2cf9d012b20cedef4c0de981e7fac83 SHA256 96d151bf10fafdf6f24e4e5265ef57f4deab8b64984270976b864c8b203eda5a
-EBUILD kphotoalbum-2.2.ebuild 1244 RMD160 cef0594b8f7632ccf3697508f5cae2b24515ac12 SHA1 c9c721fd72f4c7fcf8f7d701c09893392227dba6 SHA256 0653760390d2c9a83c131e2b24a9c45273dd79cef8eca7ffe2e80850f1e70946
-MD5 1d4c470ff10036350f54071c6d5ba7d5 kphotoalbum-2.2.ebuild 1244
-RMD160 cef0594b8f7632ccf3697508f5cae2b24515ac12 kphotoalbum-2.2.ebuild 1244
-SHA256 0653760390d2c9a83c131e2b24a9c45273dd79cef8eca7ffe2e80850f1e70946 kphotoalbum-2.2.ebuild 1244
-EBUILD kphotoalbum-3.0.1.ebuild 1569 RMD160 6d78de3fe3bd91a550827a899f1e88448ce24fb9 SHA1 de05046d8f9fe79cf1a1bdf7ee365b8d9d773d87 SHA256 96646441d295b9c705e6b2aa235c1fb6833db5c305f2cf731fb78fc20ae8af8b
-MD5 bc67907b0bfc2fbaa3d2dd13a1dd439f kphotoalbum-3.0.1.ebuild 1569
-RMD160 6d78de3fe3bd91a550827a899f1e88448ce24fb9 kphotoalbum-3.0.1.ebuild 1569
-SHA256 96646441d295b9c705e6b2aa235c1fb6833db5c305f2cf731fb78fc20ae8af8b kphotoalbum-3.0.1.ebuild 1569
+DIST kphotoalbum-3.1.0.tar.bz2 15501532 RMD160 68c3a862a1cc2cb8f91c751edf56226b7fc7be08 SHA1 9857ab2839c9e913bfdcc61e59ac4c4e8ba8cf23 SHA256 1dd56b6f152379d26cad590fc01c6eba4ff001f3309685e07771926335412511
EBUILD kphotoalbum-3.0.2-r1.ebuild 2721 RMD160 702578b1577acf94668fb753a81c83d579bbd340 SHA1 2e4e36698a6899ece82ae26125f7903c4dacb338 SHA256 a98a630d4dcac05d48880023a4eff0d70653802498f01d1e2343c7749a20d6ab
MD5 7902ede1325751734bd1dca2e2ee34dc kphotoalbum-3.0.2-r1.ebuild 2721
RMD160 702578b1577acf94668fb753a81c83d579bbd340 kphotoalbum-3.0.2-r1.ebuild 2721
SHA256 a98a630d4dcac05d48880023a4eff0d70653802498f01d1e2343c7749a20d6ab kphotoalbum-3.0.2-r1.ebuild 2721
-EBUILD kphotoalbum-3.0.2.ebuild 1566 RMD160 112bc5f0ccf13bcf509ac61d96916dbe4ce52fec SHA1 c2da7ea5e9ce904706f877328249e76c1f13e497 SHA256 b09f78352f7586428f728776c5c034d44bb5e85680d7ac7146ef2c52218b9315
-MD5 4aa68cbc3bf16faf8cdd51db7e926ab1 kphotoalbum-3.0.2.ebuild 1566
-RMD160 112bc5f0ccf13bcf509ac61d96916dbe4ce52fec kphotoalbum-3.0.2.ebuild 1566
-SHA256 b09f78352f7586428f728776c5c034d44bb5e85680d7ac7146ef2c52218b9315 kphotoalbum-3.0.2.ebuild 1566
EBUILD kphotoalbum-3.0.ebuild 1563 RMD160 545a0fd6d54961051033f787e8970e8e63da698d SHA1 f63ca42cfcb97933337c5059c04d2b990d46f796 SHA256 f9177ef9e787fe8529de76dc743bb1f93666c408741e17272fb6c96c8561e8b5
MD5 2cb3295875b2ce79e4d58052789d4d97 kphotoalbum-3.0.ebuild 1563
RMD160 545a0fd6d54961051033f787e8970e8e63da698d kphotoalbum-3.0.ebuild 1563
SHA256 f9177ef9e787fe8529de76dc743bb1f93666c408741e17272fb6c96c8561e8b5 kphotoalbum-3.0.ebuild 1563
-MISC ChangeLog 3967 RMD160 4e0e16a427faefe825c19e905ce11222a7e564d8 SHA1 4cc15d0383f0de3c805cc1b9cd59e3d878627e70 SHA256 3fa64b60f8de34d1f1638dae6344a1adcc3bbecfb366f9f7034fceeb67357d3f
-MD5 596e3345689eae983ff3096d476d498d ChangeLog 3967
-RMD160 4e0e16a427faefe825c19e905ce11222a7e564d8 ChangeLog 3967
-SHA256 3fa64b60f8de34d1f1638dae6344a1adcc3bbecfb366f9f7034fceeb67357d3f ChangeLog 3967
+EBUILD kphotoalbum-3.1.0.ebuild 2640 RMD160 bf94fad01346c05ce63be16f206a6e029c0b0cde SHA1 79934cb6ad708a651911fb78203973ca7e95d4e2 SHA256 f84af1785ce71cc32603cd2fd96b73ebf04ebbe87fb5ac44aab04a3e4885d0e6
+MD5 af3a7751641fda3abc2c7b348ccc4a3c kphotoalbum-3.1.0.ebuild 2640
+RMD160 bf94fad01346c05ce63be16f206a6e029c0b0cde kphotoalbum-3.1.0.ebuild 2640
+SHA256 f84af1785ce71cc32603cd2fd96b73ebf04ebbe87fb5ac44aab04a3e4885d0e6 kphotoalbum-3.1.0.ebuild 2640
+MISC ChangeLog 4268 RMD160 58fe1f360bb6868675e60d8004d2b4cb7d24aec7 SHA1 049f701a2582b3f0db21f0ad8185194c5f52ca23 SHA256 64c7a0729c97817db1c82eb091b8d2a8cf49efdd384f8179b4f7bf91d71fce46
+MD5 8a91234eb34e9e22a825656baa8d94fe ChangeLog 4268
+RMD160 58fe1f360bb6868675e60d8004d2b4cb7d24aec7 ChangeLog 4268
+SHA256 64c7a0729c97817db1c82eb091b8d2a8cf49efdd384f8179b4f7bf91d71fce46 ChangeLog 4268
MISC metadata.xml 248 RMD160 2496433ba875280762276effbe643d23ed6ebc24 SHA1 d52a48022c4d51e5da3b9321d031d6a05e71092e SHA256 7c28b3f9ef364c8202e380a019e8688e0f488ed625969485fea60e5d1f8eeeb6
MD5 63552b6108173d9d09b942a01217c9ab metadata.xml 248
RMD160 2496433ba875280762276effbe643d23ed6ebc24 metadata.xml 248
SHA256 7c28b3f9ef364c8202e380a019e8688e0f488ed625969485fea60e5d1f8eeeb6 metadata.xml 248
-MD5 3e836749cd7570a18d1e331a77790a5c files/digest-kphotoalbum-2.2 256
-RMD160 56e0479023ea05a4f4f5621ae8b896e9a6abbc96 files/digest-kphotoalbum-2.2 256
-SHA256 b8112ffe966fc4b0fab6e95ca6ae4dd17c64656f6e4333adc3c912a660c98092 files/digest-kphotoalbum-2.2 256
MD5 0e164f5ae65225ed75697ef040967e13 files/digest-kphotoalbum-3.0 256
RMD160 ca9a3623e2e722197d8f5bbb9aa330b898103638 files/digest-kphotoalbum-3.0 256
SHA256 49218f918e254f470a755d8975df0af46845078b021aedbce2cc6fbb79fe91c1 files/digest-kphotoalbum-3.0 256
-MD5 080881f98c20a30ac5e2b46e1f283c57 files/digest-kphotoalbum-3.0.1 262
-RMD160 17958918e91d5f5375017a5e51ff6f800b4b74de files/digest-kphotoalbum-3.0.1 262
-SHA256 a1be40d2a3e1dd912b8d879859274a862ef888a4166513a0d4ae25b4a3fbb227 files/digest-kphotoalbum-3.0.1 262
-MD5 b146db5c50ae48271cf446b8f75f2472 files/digest-kphotoalbum-3.0.2 262
-RMD160 96143586404b357196424bb68473da68862078dc files/digest-kphotoalbum-3.0.2 262
-SHA256 4f4c1d23b0ae0ca29cad49dcdafb119acd5198a58f29e351e40660f101325654 files/digest-kphotoalbum-3.0.2 262
MD5 b146db5c50ae48271cf446b8f75f2472 files/digest-kphotoalbum-3.0.2-r1 262
RMD160 96143586404b357196424bb68473da68862078dc files/digest-kphotoalbum-3.0.2-r1 262
SHA256 4f4c1d23b0ae0ca29cad49dcdafb119acd5198a58f29e351e40660f101325654 files/digest-kphotoalbum-3.0.2-r1 262
+MD5 aa4f27f993ac09876d7965645c5ca148 files/digest-kphotoalbum-3.1.0 262
+RMD160 df58430a0bf44c21708ee8c1ae9ac19a8af8a3f6 files/digest-kphotoalbum-3.1.0 262
+SHA256 48eaf31b252255315dcc372fc1f693ee6567dc8ee9fc36ec5825c906ed9328bc files/digest-kphotoalbum-3.1.0 262
diff --git a/media-gfx/kphotoalbum/files/digest-kphotoalbum-2.2 b/media-gfx/kphotoalbum/files/digest-kphotoalbum-2.2
deleted file mode 100644
index 3d6e0408ffed..000000000000
--- a/media-gfx/kphotoalbum/files/digest-kphotoalbum-2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0584b3d5f54d8a2e19cd7bc40967c026 kphotoalbum-2.2.tar.bz2 11724907
-RMD160 c452913487b73834c8bc0e4d66da9008b584f100 kphotoalbum-2.2.tar.bz2 11724907
-SHA256 2ab9a186d1d3823c6fba418560701f37ad7af88d65aea6084b864cebff91e911 kphotoalbum-2.2.tar.bz2 11724907
diff --git a/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.1 b/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.1
deleted file mode 100644
index 043f27e571d9..000000000000
--- a/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea44852ec73afb2d11adbabb48387067 kphotoalbum-3.0.1.tar.bz2 15485953
-RMD160 d89ce616791df99c684dbb71ee07e559af91ffbf kphotoalbum-3.0.1.tar.bz2 15485953
-SHA256 5e55a8bfbd7b210ff5cab70df41c9b415242baedc0e3adc0fa137b86be725617 kphotoalbum-3.0.1.tar.bz2 15485953
diff --git a/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.2 b/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.2
deleted file mode 100644
index 80f9152c4f58..000000000000
--- a/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 decdf031878de8333f030d1e77ea8ae3 kphotoalbum-3.0.2.tar.bz2 15487681
-RMD160 05d986cb7b701730bdd6f93ab8c5fabe1b858ed3 kphotoalbum-3.0.2.tar.bz2 15487681
-SHA256 bdf06c6398666b071ec4fe91cdae10b5fc949299b13b4d5897690161e625f499 kphotoalbum-3.0.2.tar.bz2 15487681
diff --git a/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.1.0 b/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.1.0
new file mode 100644
index 000000000000..e46ba19feef4
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/digest-kphotoalbum-3.1.0
@@ -0,0 +1,3 @@
+MD5 c9f5b86a15271ee204e1b0cb513788d3 kphotoalbum-3.1.0.tar.bz2 15501532
+RMD160 68c3a862a1cc2cb8f91c751edf56226b7fc7be08 kphotoalbum-3.1.0.tar.bz2 15501532
+SHA256 1dd56b6f152379d26cad590fc01c6eba4ff001f3309685e07771926335412511 kphotoalbum-3.1.0.tar.bz2 15501532
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch b/media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch
new file mode 100644
index 000000000000..f1133c093cd9
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-3.1.0-exiv2.patch
@@ -0,0 +1,146 @@
+--- kphotoalbum/src/Makefile.am 2007/12/01 00:03:03 743451
++++ kphotoalbum/src/Makefile.am 2007/12/01 00:09:53 743452
+@@ -10,8 +10,6 @@
+ if compile_with_exiv2
+ EXIF_DIR = Exif
+ KPHOTOALBUM_EXIV2_LIBS = Exif/libexif.la -lexiv2
+-else
+- KPHOTOALBUM_EXIV2_LIBS = Exif/libexif.la
+ endif
+
+ if compile_with_kexidb
+--- kphotoalbum/src/Settings/SettingsDialog.cpp 2007/12/01 00:03:03 743451
++++ kphotoalbum/src/Settings/SettingsDialog.cpp 2007/12/01 00:09:53 743452
+@@ -57,6 +57,7 @@
+ #ifdef HASEXIV2
+ # include "Exif/Info.h"
+ # include "Exif/TreeView.h"
++# include "Exif/SyncWidget.h"
+ #endif
+
+ #ifdef SQLDB_SUPPORT
+@@ -65,7 +66,6 @@
+ #endif
+
+ #include "CategoryItem.h"
+-#include "Exif/SyncWidget.h"
+
+ Settings::SettingsDialog::SettingsDialog( QWidget* parent, const char* name )
+ :KDialogBase( IconList, i18n( "Settings" ), Apply | Ok | Cancel, Ok, parent, name, false ), _currentCategory( QString::null ), _currentGroup( QString::null )
+@@ -435,7 +435,6 @@
+ _exifForViewer->setSelected( Settings::SettingsData::instance()->exifForViewer() );
+ _exifForDialog->setSelected( Settings::SettingsData::instance()->exifForDialog() );
+ _iptcCharset->setCurrentItem( opt->iptcCharset() );
+-#endif
+
+ // Synchronization page
+ _orientationRead->updatePreferred( Settings::SettingsData::instance()->orientationSyncing( false ) );
+@@ -458,6 +457,7 @@
+ _catMulti[ (*it)->name() ]->setCurrentItem( opt->categorySyncingMultiValue( (*it)->name() ) );
+ _catAddName[ (*it)->name() ]->setChecked( opt->categorySyncingAddName( (*it)->name() ) );
+ }
++#endif
+
+ QString backend = Settings::SettingsData::instance()->backend();
+ if (backend == QString::fromLatin1("xml"))
+@@ -548,7 +548,6 @@
+ opt->setExifForViewer( _exifForViewer->selected() ) ;
+ opt->setExifForDialog( _exifForDialog->selected() ) ;
+ opt->setIptcCharset( _iptcCharset->currentItem() );
+-#endif
+
+ // Synchronization
+ opt->setOrientationSyncing( false, _orientationRead->items() );
+@@ -559,6 +558,7 @@
+ opt->setDescriptionSyncing( true, _descriptionWrite->items() );
+ opt->setDateSyncing( false, _dateRead->items() );
+ opt->setDateSyncing( true, _dateWrite->items() );
++
+ for (QDictIterator<Exif::SyncWidget> it( _catFieldsRead ); it.current(); ++it ) {
+ opt->setCategorySyncingFields( false, it.currentKey(), it.current()->items() );
+ }
+@@ -574,6 +574,7 @@
+ for (QDictIterator<QCheckBox> it( _catAddName ); it.current(); ++it ) {
+ opt->setCategorySyncingAddName( it.currentKey(), it.current()->isChecked() );
+ }
++#endif
+
+ // SQLDB
+ #ifdef SQLDB_SUPPORT
+@@ -1023,6 +1024,7 @@
+
+ void Settings::SettingsDialog::createSyncPage()
+ {
++#ifdef HASEXIV2
+ _syncPage = addPage( i18n("Metadata"), i18n("Metadata Synchronization"),
+ KGlobal::iconLoader()->loadIcon( QString::fromLatin1( "saveas" ),
+ KIcon::Desktop, 32 ) );
+@@ -1073,6 +1075,7 @@
+ slotCategoryAdded( (*it)->name() );
+
+ _lay->addWidget( _syncTabs );
++#endif
+ }
+
+ void Settings::SettingsDialog::slotCategoryAdded( const QString& name )
+@@ -1086,6 +1089,8 @@
+ QGrid* box = new QGrid( 2, Horizontal, _syncPage );
+ box->setSpacing( 6 );
+
++
++#ifdef HASEXIV2
+ const Settings::SettingsData* opt = Settings::SettingsData::instance();
+
+ _catFieldsRead.replace( name, new Exif::SyncWidget( i18n("Fields to get value from"), box,
+@@ -1107,10 +1112,12 @@
+ new QWidget( box );
+ _catAddName.replace( name, new QCheckBox( i18n("Include category name in tag value" ), box ) );
+ _syncTabs->addTab( box, name );
++#endif
+ }
+
+ void Settings::SettingsDialog::slotCategoryRemoved( const QString& name )
+ {
++#ifdef HASEXIV2
+ for (int i = 0; _syncTabs->page( i ); ++i )
+ if ( _syncTabs->label( i ).remove( '&' ) == name ) {
+ _catFieldsRead.remove( name );
+@@ -1123,6 +1130,9 @@
+ delete tab;
+ return;
+ }
++#else
++ Q_UNUSED( name );
++#endif
+ }
+
+ void Settings::SettingsDialog::slotCategoryRenamed( const QString& oldName, const QString& newName )
+--- kphotoalbum/src/Settings/SettingsDialog.h 2007/12/01 00:03:03 743451
++++ kphotoalbum/src/Settings/SettingsDialog.h 2007/12/01 00:09:53 743452
+@@ -21,7 +21,11 @@
+ #include <kdialogbase.h>
+ #include "Settings/SettingsData.h"
+ #include "DB/MemberMap.h"
+-#include "Exif/SyncWidget.h"
++
++#ifdef HASEXIV2
++# include "Exif/SyncWidget.h"
++#endif
++
+ class QListView;
+ class KColorButton;
+ class QSpinBox;
+@@ -171,11 +175,13 @@
+ // Synchronization
+ QTabWidget* _syncTabs;
+ QWidget* _syncPage;
++#ifdef HASEXIV2
+ Exif::SyncWidget *_labelRead, *_labelWrite, *_descriptionRead, *_descriptionWrite,
+ *_orientationRead, *_orientationWrite, *_dateRead, *_dateWrite;
+ QDict<Exif::SyncWidget> _catFieldsRead, _catFieldsWrite;
+ QDict<KComboBox> _catSuper, _catMulti;
+ QDict<QCheckBox> _catAddName;
++#endif
+
+ int _backendPageIndex;
+ QButtonGroup* _backendButtons;
diff --git a/media-gfx/kphotoalbum/kphotoalbum-2.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-2.2.ebuild
deleted file mode 100644
index 0cd086e8112d..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-2.2.ebuild,v 1.13 2007/07/12 04:08:47 mr_bones_ Exp $
-
-inherit kde
-
-IUSE="exif"
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="http://www.kphotoalbum.org/download/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-
-DEPEND="!media-gfx/kimdaba
- exif? ( >=media-libs/libkexif-0.2.1
- >=media-gfx/exiv2-0.9.1 )
- >=media-libs/libkipi-0.1
- || ( kde-base/kdegraphics-kfile-plugins kde-base/kdegraphics )"
-
-need-kde 3.2
-
-pkg_setup()
-{
- setupok=1
- if use exif ; then
- if ! built_with_use =x11-libs/qt-3* sqlite ; then
- elog "To enable KPhotoAlbum to search your images"
- elog "using EXIF information you also need to have"
- elog "Qt installed with SQLite support."
- elog
- elog "Make sure your Qt is installed with the sqlite USE flag."
- setupok=0
- fi
- if [ $setupok != 0 ] ; then
- slot_rebuild "media-libs/libkipi media-libs/libkexif"
- setupok=$?
- fi
- else
- slot_rebuild "media-libs/libkipi"
- setupok=$?
- fi
- if [ $setupok == 0 ] ; then
- die
- fi
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.0.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.0.1.ebuild
deleted file mode 100644
index 7da515078b9f..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-3.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.0.1.ebuild,v 1.3 2007/07/12 04:08:47 mr_bones_ Exp $
-
-inherit kde
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="http://www.kphotoalbum.org/download/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="arts exif"
-
-# kde-base/unsermake
-DEPEND="!media-gfx/kimdaba
- exif? ( >=media-libs/libkexif-0.2.3
- >=media-gfx/exiv2-0.9.1 )
- >=media-libs/libkipi-0.1
- || ( kde-base/kdegraphics-kfile-plugins kde-base/kdegraphics )
- arts? ( kde-base/arts )"
-
-need-kde 3.2
-
-pkg_setup()
-{
- setupok=1
- if use exif ; then
- if ! built_with_use =x11-libs/qt-3* sqlite ; then
- elog "To enable KPhotoAlbum to search your images"
- elog "using EXIF information you also need to have"
- elog "Qt installed with SQLite support."
- elog
- elog "Make sure your Qt is installed with the sqlite USE flag."
- setupok=0
- fi
- if [ $setupok != 0 ] ; then
- slot_rebuild "media-libs/libkipi media-libs/libkexif"
- setupok=$?
- fi
- else
- slot_rebuild "media-libs/libkipi"
- setupok=$?
- fi
- if [ $setupok == 0 ] ; then
- die
- fi
-}
-
-src_compile()
-{
- if ! use exif; then
- elog "NOTICE: You have the exif USE flag disabled. ${CATEGORY}/${PN}"
- elog "will be compiled without EXIF support unless you installed"
- elog "media-gfx/exiv2 manually."
- local myconf="--disable-exiv2"
- fi
- kde_src_compile
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.0.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.0.2.ebuild
deleted file mode 100644
index 73bfd6f289c5..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-3.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.0.2.ebuild,v 1.2 2007/04/30 22:06:34 genone Exp $
-
-inherit kde
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="http://www.kphotoalbum.org/download/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="arts exif"
-
-# kde-base/unsermake
-DEPEND="!media-gfx/kimdaba
- exif? ( >=media-libs/libkexif-0.2.3
- >=media-gfx/exiv2-0.9.1 )
- >=media-libs/libkipi-0.1
- || ( kde-base/kdegraphics-kfile-plugins kde-base/kdegraphics )
- arts? ( kde-base/arts )"
-
-need-kde 3.2
-
-pkg_setup()
-{
- setupok=1
- if use exif ; then
- if ! built_with_use =x11-libs/qt-3* sqlite ; then
- elog "To enable KPhotoAlbum to search your images"
- elog "using EXIF information you also need to have"
- elog "Qt installed with SQLite support."
- elog
- elog "Make sure your Qt is installed with the sqlite USE flag."
- setupok=0
- fi
- if [ $setupok != 0 ] ; then
- slot_rebuild "media-libs/libkipi media-libs/libkexif"
- setupok=$?
- fi
- else
- slot_rebuild "media-libs/libkipi"
- setupok=$?
- fi
- if [ $setupok == 0 ] ; then
- die
- fi
-}
-
-src_compile()
-{
- if ! use exif; then
- elog "NOTICE: You have the exif USE flag disabled. ${CATEGORY}/${PN}"
- elog "will be compiled without EXIF support unless you installed"
- elog "media-gfx/exiv2 manually."
- local myconf="--disable-exiv2"
- fi
- kde_src_compile
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
new file mode 100644
index 000000000000..ecd006fcdb8a
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild,v 1.1 2007/12/02 00:58:19 philantrop Exp $
+
+inherit kde
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
+HOMEPAGE="http://www.kphotoalbum.org/"
+SRC_URI="http://www.kphotoalbum.org/download/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="arts exif raw"
+
+LANGS="ar be br ca cs cy da de el en_GB es et fi fr ga gl hi is it ja ka lt mt
+nb nds nl pa pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tr uk vi zh_CN"
+
+LANGS_DOC="da de es et fr it nl pt sv"
+
+for lang in ${LANGS}; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+DEPEND="exif? ( >=media-gfx/exiv2-0.15 )
+ raw? ( >=media-libs/libkdcraw-0.1.1 )
+ >=media-libs/jpeg-6b-r7
+ >=media-libs/libkipi-0.1
+ || ( kde-base/kdegraphics kde-base/kdegraphics-kfile-plugins )
+ arts? ( kde-base/arts )"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-exiv2.patch"
+
+pkg_setup() {
+ setupok=1
+ if use exif ; then
+ if ! built_with_use =x11-libs/qt-3* sqlite ; then
+ elog "To enable KPhotoAlbum to search your images"
+ elog "using EXIF information you also need to have"
+ elog "Qt installed with SQLite support."
+ elog
+ elog "Make sure your Qt is installed with the sqlite USE flag."
+ setupok=0
+ fi
+ fi
+
+ slot_rebuild "media-libs/libkipi"
+ setupok=$?
+
+ if [ $setupok == 0 ] ; then
+ die
+ fi
+}
+
+src_unpack() {
+ kde_src_unpack
+
+ # Adapted from kde.eclass
+ if [[ -z ${LINGUAS} ]]; then
+ elog "You can drop some of the translations of the interface and"
+ elog "documentation by setting the \${LINGUAS} variable to the"
+ elog "languages you want installed."
+ elog
+ elog "Enabling all languages"
+ else
+ if [[ -n ${LANGS} ]]; then
+ MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | tr ' ' '\n' | sort | uniq -d))
+ elog "Enabling translations for: ${MAKE_PO}"
+ sed -i -e "s:^SUBDIRS=.*:SUBDIRS = ${MAKE_PO}:" "${KDE_S}/translations/Makefile.am" \
+ || die "sed for locale failed"
+ rm -f "${KDE_S}/configure"
+ fi
+
+ if [[ -n ${LANGS_DOC} ]]; then
+ MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | tr ' ' '\n' | sort | uniq -d))
+ elog "Enabling documentation for: ${MAKE_DOC}"
+ elog "(If some languages you chose are missing, it's because there's no translation for them.)"
+ fi
+ fi
+}
+
+src_compile() {
+ local myconf="$(use_enable raw kdcraw)"
+ if ! use exif; then
+ elog "NOTICE: You have the exif USE flag disabled. ${CATEGORY}/${PN}"
+ elog "will be compiled without EXIF support."
+ myconf="${myconf} --disable-exiv2"
+ fi
+ kde_src_compile
+}