summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/solid/ChangeLog4
-rw-r--r--kde-base/solid/Manifest7
-rw-r--r--kde-base/solid/solid-4.1.96-r1.ebuild3
-rw-r--r--kde-base/solid/solid-4.1.96.ebuild47
-rw-r--r--kde-base/solid/solid-4.2.0.ebuild3
5 files changed, 11 insertions, 53 deletions
diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index da99062b39b..bec989e5410 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jan 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ solid-4.1.96-r1.ebuild, -solid-4.1.96.ebuild, solid-4.2.0.ebuild:
+ Moved patching to autopatcher in solid, removed old solid ebuild
+
*solid-4.2.0 (22 Jan 2009)
22 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org> +solid-4.2.0.ebuild:
diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index 9a730d9e989..9359b18cb2e 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -1,9 +1,8 @@
AUX solid-4.2.0-backport-solid-bluetooth.patch 42383 RMD160 1aa238d89288ecc7f9bf00dfb532f216ea945bbb SHA1 c455e31c498f21e07a206fe28d10bf5e6acc726a SHA256 e3eeee966f4ca5c074a5cc187ee850dab4c999c3fd5deeffb194a1dd352072d4
DIST kdebase-workspace-4.1.96.tar.bz2 43193383 RMD160 f559dcd554b7b17ff0e173043eafb134cc443fa4 SHA1 958d498f875434ab106351b83e3c818f847d6204 SHA256 5efa0d29aaa7fcc0d948e05856532b81f04bc72bddfd6f779206c36d240d052c
DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
-EBUILD solid-4.1.96-r1.ebuild 1076 RMD160 728a563b9a96355da6c2ea386c9e357bc8654833 SHA1 bfe7f783d119c54ffb8f610d1b6ce8a7b5b20dc3 SHA256 22876af92170d61440bbed3aa4cb12e336198e31a8b45f9f79e2e74b9466b47c
-EBUILD solid-4.1.96.ebuild 1013 RMD160 04ffadc7dcd0d00eafbf7f99aa894d33a2322f01 SHA1 db6620b79d61f0eae1cffe176050bdf8e8062006 SHA256 47ed39a38993ac50750f39ded818762a7bebd4030f2307382514f57672f0da74
-EBUILD solid-4.2.0.ebuild 1069 RMD160 f79a7b0c9fb2de56b0aabe799fe6c645f2e5d5d6 SHA1 1d9a88841ac3af59d5c6af275d2d720ba717d186 SHA256 1955e5ef7b5d9e3815d3ba8dd8c2cab0806cea19946a84b96fa70a608d8a24f0
+EBUILD solid-4.1.96-r1.ebuild 1083 RMD160 2d8cdd29f69010d5f44feedb93159c8d7a7cf10b SHA1 9f04aa9a3e9a045bd4f9242bd64abd08e17b05e9 SHA256 c1c2cfaf577a95bf2137840437685a3b08dbfce4db92f635ce1d87e4ec2402f5
+EBUILD solid-4.2.0.ebuild 1083 RMD160 2d8cdd29f69010d5f44feedb93159c8d7a7cf10b SHA1 9f04aa9a3e9a045bd4f9242bd64abd08e17b05e9 SHA256 c1c2cfaf577a95bf2137840437685a3b08dbfce4db92f635ce1d87e4ec2402f5
EBUILD solid-9999.ebuild 1002 RMD160 cec257f1409314ed16b2f36320dc98dc1d797cf0 SHA1 e9bb240a727c96011892f01f61f5e80265c5b78c SHA256 9b34f9b7f55249dd4894417ba6e86c1b99849c4e44d44c2052393f5ea8308e0b
-MISC ChangeLog 3786 RMD160 c1c877fa9184c0bcb05d2d1b1e331c547135784c SHA1 6a049e276df1003bba41e1af16cb36f492628ae0 SHA256 ed4b7400e2759db7611cccc7820837319f3c86459920dc4b9ceb32c6307123fb
+MISC ChangeLog 3986 RMD160 ce6796c72416d7ce9f021e0c9e8d35abb0d415b4 SHA1 33f7d0cda6dee8038cd07cc87943f7f1eb9bcabc SHA256 1e03e0a26b61c965c22b441b4e76d4a9e41a7445252a265661b5acc6f0cc8a12
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/solid/solid-4.1.96-r1.ebuild b/kde-base/solid/solid-4.1.96-r1.ebuild
index 91fdb7b21b5..5739f27588f 100644
--- a/kde-base/solid/solid-4.1.96-r1.ebuild
+++ b/kde-base/solid/solid-4.1.96-r1.ebuild
@@ -31,8 +31,9 @@ KMEXTRA="
libs/solid/
"
+PATCHES=( "${FILESDIR}/${PN}-4.2.0-backport-solid-bluetooth.patch" )
+
src_configure() {
- epatch ${FILESDIR}/${PN}-4.2.0-backport-solid-bluetooth.patch
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with bluetooth BlueZ)
$(cmake-utils_use_with networkmanager NetworkManager)"
diff --git a/kde-base/solid/solid-4.1.96.ebuild b/kde-base/solid/solid-4.1.96.ebuild
deleted file mode 100644
index b686370cadf..00000000000
--- a/kde-base/solid/solid-4.1.96.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="kdebase-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth debug networkmanager"
-
-# solid/CMakeLists.txt has an add_subdirectory statement that depends on
-# networkmanager-0.7, referring to a non-existant directory, restricted to =0.6*
-# for now.
-DEPEND="
- >=sys-apps/hal-0.5.9
- bluetooth? (
- || (
- net-wireless/bluez
- net-wireless/bluez-libs
- )
- )
- networkmanager? ( >=net-misc/networkmanager-0.7 )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
- libs/solid/
-"
-
-src_configure() {
- mycmakeargs="${mycmakeargs}
- $(cmake-utils_use_with bluetooth BlueZ)
- $(cmake-utils_use_with networkmanager NetworkManager)"
-
- kde4-meta_src_configure
-}
-
-pkg_postinst() {
- elog "If you want to be notified about new plugged devices by a popup,"
- elog "install kde-base/soliduiserver"
-
- kde4-meta_pkg_postinst
-}
diff --git a/kde-base/solid/solid-4.2.0.ebuild b/kde-base/solid/solid-4.2.0.ebuild
index cb1693e9fbc..5739f27588f 100644
--- a/kde-base/solid/solid-4.2.0.ebuild
+++ b/kde-base/solid/solid-4.2.0.ebuild
@@ -31,8 +31,9 @@ KMEXTRA="
libs/solid/
"
+PATCHES=( "${FILESDIR}/${PN}-4.2.0-backport-solid-bluetooth.patch" )
+
src_configure() {
- epatch ${FILESDIR}/${P}-backport-solid-bluetooth.patch
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with bluetooth BlueZ)
$(cmake-utils_use_with networkmanager NetworkManager)"