summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD18
2 files changed, 26 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a518c8c156f..f75e8c3222de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -41,32 +41,34 @@ pkgbase = efl-git
optdepends = gstreamer0.10-ugly-plugins: Access more types of video in Emotion
optdepends = gstreamer0.10-ffmpeg: Access video with ffmpeg in Emotion
provides = ecore=$pkgver
+ provides = edbus=$pkgver
+ provides = edje=$pkgver
+ provides = eet=$pkgver
+ provides = eeze=$pkgver
+ provides = efreet=$pkgver
+ provides = eina=$pkgver
+ provides = eio=$pkgver
+ provides = embryo=$pkgver
+ provides = emotion=$pkgver
+ provides = ephysics=$pkgver
+ provides = ethumb=$pkgver
+ provides = evas=$pkgver
provides = ecore-svn
- provides = edbus
provides = edbus-svn
- provides = edje=$pkgver
provides = edje-svn
- provides = eet=$pkgver
provides = eet-svn
- provides = eeze=$pkgver
provides = eeze-svn
- provides = efreet=$pkgver
provides = efreet-svn
- provides = eina=$pkgver
provides = eina-svn
- provides = eio=$pkgver
provides = eio-svn
- provides = embryo=$pkgver
provides = embryo-svn
- provides = emotion=$pkgver
provides = emotion-svn
- provides = ephysics
provides = ephysics-svn
- provides = ethumb=$pkgver
provides = ethumb-svn
- provides = evas=$pkgver
provides = evas-svn
provides = efl-svn
+ provides = efl
+ provides = efl_x11
conflicts = ecore
conflicts = edbus
conflicts = edje
@@ -81,6 +83,8 @@ pkgbase = efl-git
conflicts = ethumb
conflicts = evas
conflicts = efl-svn
+ conflicts = efl
+ conflicts = efl_x11
options = !libtool
options = debug
source = git://git.enlightenment.org/core/efl.git
diff --git a/PKGBUILD b/PKGBUILD
index 3d2faddc9a0c..bdea1b58a5f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,13 +23,15 @@ optdepends=('python2: compare Eina benchmarks'
'gstreamer0.10-ugly-plugins: Access more types of video in Emotion'
'gstreamer0.10-ffmpeg: Access video with ffmpeg in Emotion'
)
-provides=('ecore=$pkgver' 'ecore-svn' 'edbus' 'edbus-svn' 'edje=$pkgver' 'edje-svn'
- 'eet=$pkgver' 'eet-svn' 'eeze=$pkgver' 'eeze-svn' 'efreet=$pkgver' 'efreet-svn'
- 'eina=$pkgver' 'eina-svn' 'eio=$pkgver' 'eio-svn' 'embryo=$pkgver' 'embryo-svn'
- 'emotion=$pkgver' 'emotion-svn' 'ephysics' 'ephysics-svn'
- 'ethumb=$pkgver' 'ethumb-svn' 'evas=$pkgver' 'evas-svn' 'efl-svn')
-conflicts=('ecore' 'edbus' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio'
- 'embryo' 'emotion' 'ephysics' 'ethumb' 'evas' 'efl-svn')
+provides=('ecore=$pkgver' 'edbus=$pkgver' 'edje=$pkgver' 'eet=$pkgver' 'eeze=$pkgver'
+ 'efreet=$pkgver' 'eina=$pkgver' 'eio=$pkgver' 'embryo=$pkgver' 'emotion=$pkgver'
+ 'ephysics=$pkgver' 'ethumb=$pkgver' 'evas=$pkgver'
+ 'ecore-svn' 'edbus-svn' 'edje-svn' 'eet-svn' 'eeze-svn' 'efreet-svn' 'eina-svn'
+ 'eio-svn' 'embryo-svn' 'emotion-svn' 'ephysics-svn' 'ethumb-svn' 'evas-svn'
+ 'efl-svn' 'efl' 'efl_x11')
+conflicts=('ecore' 'edbus' 'edje' 'eet' 'eeze' 'efreet' 'eina'
+ 'eio' 'embryo' 'emotion' 'ephysics' 'ethumb' 'evas'
+ 'efl-svn' 'efl' 'efl_x11')
options=('!libtool' 'debug')
install=efl.install
source=("git://git.enlightenment.org/core/$_pkgname.git")
@@ -65,7 +67,7 @@ build() {
package() {
cd "$srcdir/$_pkgname"
-
+
make -j1 DESTDIR="$pkgdir" install
# install license files