media-tv/democracy: Use valid atoms in built_with_use checks (!!!); also make pkg_pos...

svn path=/sunrise/; revision=4020

diff --git a/media-tv/democracy/ChangeLog b/media-tv/democracy/ChangeLog
index 5a4213c32feb6a3d6176e088a2be2b75f1f26ce8..36b6de892fd0e2b0dfc77c769da57da99ef2c360 100644 (file)
--- a/media-tv/democracy/ChangeLog
+++ b/media-tv/democracy/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jun 2007; Jakub Moc <jakub@gentoo.org> democracy-0.9.5.1.ebuild:
+  Use valid atoms in built_with_use checks (!!!); also make pkg_postinst
+  non-fatal in case a use flag vanishes, cosmetics
+
   26 Apr 2007; Ali Polatel (hawking) <polatel@gmail.com>
   democracy-0.9.5.1.ebuild:
   Remove inherit versionator

diff --git a/media-tv/democracy/Manifest b/media-tv/democracy/Manifest
index 96e2d7bee226e230d5f472e7fdd12a50574fdaf2..fb4e111a9e4d6b6e50534f44f9b9d469d9d0d184 100644 (file)
--- a/media-tv/democracy/Manifest
+++ b/media-tv/democracy/Manifest
@@ -1,5 +1,5 @@
 AUX democracy-as-needed-libX11.patch 640 RMD160 34b1528f276722f70a9d13cbb145dc8bbfed88b1 SHA1 50bd164b5ad24231252afb1a28a1c5b6f8bd9f05 SHA256 65bc455fadd9445e34e4dd2fd8eecb5a923939aefe233aabb82b8ead5570e990
 DIST Democracy-0.9.5.1.tar.gz 6472007 RMD160 4cc77c12ab43c7e3eb475fd5d26dcc67a1110b02 SHA1 cd9df95fbd9469fae6cc302c7facfa684eab1848 SHA256 6ee751c59e2aa80753f680b1a038409562ad9244588d8c454bc2bb5f13e0ac8c
-EBUILD democracy-0.9.5.1.ebuild 2463 RMD160 8812152bbc38596632b7074cdc23592d14fbc94a SHA1 c26dbdf0282832de9f332eb5c7f12979d5adafbf SHA256 c879a994e633aea957716497e6ff261aca9624fdc1da023f006aa42b98c898dc
-MISC ChangeLog 4715 RMD160 ce3a653b9374a9f7de90a50fa11063745b7eb0b8 SHA1 19fbd33cefa268badb8b0f674457b9be08817ad4 SHA256 3dac8e85dfa26adb48216e2dd34475195cd7d495dc560010e8d1ccd3409c8cd3
+EBUILD democracy-0.9.5.1.ebuild 2504 RMD160 129ec105005ef7d405c449533420976dd7696b6a SHA1 5118fd6306a9fe1d44048f43315d64da81dc41ac SHA256 b1b074dbd80cbb358717987cf1f9fabce265d692c3c89ba6f1c3e28d01fdb899
+MISC ChangeLog 4910 RMD160 94519b618f79c928c7db5f34034c13c2a410178b SHA1 56fdd54501766d1889bd87313e535636aaf2ad7a SHA256 df7a129c8cc4e93a178f95f55a4e9ce56af6267c89007adecabf989c00fb9d5d
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/media-tv/democracy/democracy-0.9.5.1.ebuild b/media-tv/democracy/democracy-0.9.5.1.ebuild
index 80c57a9ec3939fad027908f37f205884e7735234..48202968625d44e86bcb4278034d7c66bff511e7 100644 (file)
--- a/media-tv/democracy/democracy-0.9.5.1.ebuild
+++ b/media-tv/democracy/democracy-0.9.5.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="dev-python/pyrex
                x11-libs/libX11
                dev-python/gst-python
                x11-apps/xset
-               =dev-python/dbus-python-0.71"
+               ~dev-python/dbus-python-0.71"
                # dbus-python versions >0.80 changed the api so democracyplayer does
                # not work with them, therefore depending on the 0.71 version in portage
                # see https://develop.participatoryculture.org/democracy/ticket/3067
@@ -36,7 +36,7 @@ DOCS="README"
 S="${WORKDIR}/${MY_P}/platform/gtk-x11"
 
 pkg_setup() {
-       if ! built_with_use python berkdb; then
+       if ! built_with_use dev-lang/python berkdb; then
                eerror "You must build python with berkdb support"
                die "Please re-emerge python with berkdb USE flag ON"
        fi
@@ -49,7 +49,7 @@ pkg_setup() {
                die "python version not patched"
        fi
 
-       if ! built_with_use -o gnome-python-extras seamonkey firefox; then
+       if ! built_with_use -o dev-python/gnome-python-extras seamonkey firefox; then
                eerror "You must build gnome-python-extras with seamonkey or firefox support"
                die "Please re-emerge gnome-python-extras with seamonkey or firefox USE flag ON"
        fi
@@ -62,13 +62,12 @@ src_unpack() {
 }
 
 pkg_postinst(){
-       if ! built_with_use xine-lib aac alsa mad asf flac sdl win32codecs mp3; then
+       if ! built_with_use --missing true media-libs/xine-lib aac alsa mad asf flac sdl win32codecs mp3; then
                ewarn "The Democracy team recommends you to emerge xine-lib as follows:"
-               ewarn ""
-               ewarn "# echo \"media-libs/xine-lib aac mad asf flac sdl
-               win32codecs mp3 \" \ "
-               ewarn ">> /etc/portage/package.use && emerge xine-lib"
-               ewarn ""
+               ewarn
+               ewarn "# echo \"media-libs/xine-lib aac mad asf flac sdl win32codecs mp3 \" \ "
+               ewarn ">> /etc/portage/package.use && emerge -N xine-lib"
+               ewarn
                ewarn "This way you will have support enabled for the most popular"
                ewarn "video and audio formats. You may also want to add support"
                ewarn "for theora and vorbis"