[SM-Commit] PERFORCE change 77757 by Eric Sandall for review

Perforce Review Daemon p4review at smee.org
Thu Apr 13 16:40:40 EDT 2006


Change 77757 by eric_sandall at sandalle-moby on 2006/04/13 21:40:33

	 * Reworking of E as proposed on the ML.

Affected files ...

... //sgl/grimoires/test/ChangeLog#242 integrate
... //sgl/grimoires/test/e/e-profile/DEPENDS#5 integrate
... //sgl/grimoires/test/e/e-profile/DETAILS#3 integrate
... //sgl/grimoires/test/e/e-profile/HISTORY#6 integrate
... //sgl/grimoires/test/e/e-profile/TRIGGERS#1 branch
... //sgl/grimoires/test/e/e16/BUILD#1 branch
... //sgl/grimoires/test/e/e16/DEPENDS#1 branch
... //sgl/grimoires/test/e/e16/DETAILS#1 branch
... //sgl/grimoires/test/e/e16/HISTORY#1 branch
... //sgl/grimoires/test/e/e16/INSTALL#1 branch
... //sgl/grimoires/test/e/e16/PREPARE#1 branch
... //sgl/grimoires/test/e/e16/PRE_BUILD#1 branch
... //sgl/grimoires/test/e/e_module-calendar/DEPENDS#2 integrate
... //sgl/grimoires/test/e/e_module-calendar/HISTORY#6 integrate
... //sgl/grimoires/test/e/e_module-devian/DEPENDS#2 integrate
... //sgl/grimoires/test/e/e_module-devian/HISTORY#6 integrate
... //sgl/grimoires/test/e/e_module-eloquence/DEPENDS#3 integrate
... //sgl/grimoires/test/e/e_module-eloquence/HISTORY#8 integrate
... //sgl/grimoires/test/e/e_module-evolume/CONFLICTS#2 delete
... //sgl/grimoires/test/e/e_module-evolume/DEPENDS#2 integrate
... //sgl/grimoires/test/e/e_module-evolume/HISTORY#5 integrate
... //sgl/grimoires/test/e/e_module-mount/CONFLICTS#2 delete
... //sgl/grimoires/test/e/e_module-mount/DEPENDS#2 integrate
... //sgl/grimoires/test/e/e_module-mount/HISTORY#5 integrate
... //sgl/grimoires/test/e/e_module-screenshot/DEPENDS#2 integrate
... //sgl/grimoires/test/e/e_module-screenshot/HISTORY#8 integrate
... //sgl/grimoires/test/e/e_module-slideshow/CONFLICTS#2 delete
... //sgl/grimoires/test/e/e_module-slideshow/DEPENDS#2 integrate
... //sgl/grimoires/test/e/e_module-slideshow/HISTORY#6 integrate
... //sgl/grimoires/test/e/e_module-tclock/CONFLICTS#2 delete
... //sgl/grimoires/test/e/e_module-tclock/DEPENDS#2 integrate
... //sgl/grimoires/test/e/e_module-tclock/HISTORY#4 integrate
... //sgl/grimoires/test/e/econf/DEPENDS#2 integrate
... //sgl/grimoires/test/e/econf/HISTORY#4 integrate
... //sgl/grimoires/test/e/enlightenment/BUILD#6 integrate
... //sgl/grimoires/test/e/enlightenment/CONFLICTS#1 branch
... //sgl/grimoires/test/e/enlightenment/DEPENDS#6 integrate
... //sgl/grimoires/test/e/enlightenment/DETAILS#10 integrate
... //sgl/grimoires/test/e/enlightenment/FINAL#2 integrate
... //sgl/grimoires/test/e/enlightenment/HISTORY#18 integrate
... //sgl/grimoires/test/e/enlightenment/INSTALL#5 integrate
... //sgl/grimoires/test/e/enlightenment/PREPARE#6 integrate
... //sgl/grimoires/test/e/enlightenment/PRE_BUILD#3 integrate
... //sgl/grimoires/test/e/enlightenment/UP_TRIGGERS#2 integrate
... //sgl/grimoires/test/e/erme/DEPENDS#2 integrate
... //sgl/grimoires/test/e/erme/HISTORY#4 integrate
... //sgl/grimoires/test/e/evolume/BUILD#2 delete
... //sgl/grimoires/test/e/evolume/CONFLICTS#2 delete
... //sgl/grimoires/test/e/evolume/DEPENDS#3 delete
... //sgl/grimoires/test/e/evolume/DETAILS#5 delete
... //sgl/grimoires/test/e/evolume/HISTORY#6 delete
... //sgl/grimoires/test/e/evolume/INSTALL#2 delete
... //sgl/grimoires/test/e/evolume/PRE_BUILD#2 delete
... //sgl/grimoires/test/e/evolume/TRIGGERS#2 delete
... //sgl/grimoires/test/e/exmms/DEPENDS#2 integrate
... //sgl/grimoires/test/e/exmms/HISTORY#9 integrate
... //sgl/grimoires/test/e/mount/BUILD#2 delete
... //sgl/grimoires/test/e/mount/CONFLICTS#2 delete
... //sgl/grimoires/test/e/mount/DEPENDS#3 delete
... //sgl/grimoires/test/e/mount/DETAILS#5 delete
... //sgl/grimoires/test/e/mount/HISTORY#6 delete
... //sgl/grimoires/test/e/mount/INSTALL#2 delete
... //sgl/grimoires/test/e/mount/PRE_BUILD#3 delete
... //sgl/grimoires/test/e/mount/TRIGGERS#2 delete
... //sgl/grimoires/test/e/slideshow/BUILD#2 delete
... //sgl/grimoires/test/e/slideshow/CONFLICTS#2 delete
... //sgl/grimoires/test/e/slideshow/DEPENDS#3 delete
... //sgl/grimoires/test/e/slideshow/DETAILS#4 delete
... //sgl/grimoires/test/e/slideshow/HISTORY#5 delete
... //sgl/grimoires/test/e/slideshow/INSTALL#2 delete
... //sgl/grimoires/test/e/slideshow/PRE_BUILD#3 delete
... //sgl/grimoires/test/e/slideshow/TRIGGERS#2 delete
... //sgl/grimoires/test/e/tclock/BUILD#2 delete
... //sgl/grimoires/test/e/tclock/CONFLICTS#2 delete
... //sgl/grimoires/test/e/tclock/DEPENDS#3 delete
... //sgl/grimoires/test/e/tclock/DETAILS#4 delete
... //sgl/grimoires/test/e/tclock/HISTORY#5 delete
... //sgl/grimoires/test/e/tclock/INSTALL#2 delete
... //sgl/grimoires/test/e/tclock/PRE_BUILD#2 delete
... //sgl/grimoires/test/e/tclock/TRIGGERS#2 delete

Differences ...

==== //sgl/grimoires/test/ChangeLog#242 (text) ====

@@ -1,3 +1,11 @@
+2006-04-13 Eric Sandall <eric at sandall.us>
+	* e/e16: Branched from enlightenment for E16
+	* e/enlightenment: Is now a profile package for E16 and E17
+	* e/evolume: Removed deprecated module (use e_module-evolume)
+	* e/mount: Removed deprecated module (use e_module-mount)
+	* e/slideshow: Removed deprecated module (use e_module-slideshow)
+	* e/tclock: Removed deprecated module (use e_module-tclock)
+
 2006-04-11 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* FUNCTIONS: added a new function: disable_pic()
 	  should be used when needing to get rid of -fPIC and -DPIC flags,

==== //sgl/grimoires/test/e/e-profile/DEPENDS#5 (xtext) ====

@@ -1,19 +1,1 @@
-depends  enlightenment  &&
-
-optional_depends  "eterm"        ""  ""  "for a terminal emulator"           &&
-optional_depends  "elicit"       ""  ""  "for a color picker and zoom tool"  &&
-optional_depends  "embrace"      ""  ""  "for a mail checker"                &&
-optional_depends  "engage"       ""  ""  "for a docker"                      &&
-optional_depends  "enotes"       ""  ""  "for a sticky notes system"         &&
-optional_depends  "entice"       ""  ""  "for an image viewer"               &&
-optional_depends  "entrance"     ""  ""  "for a display manager"             &&
-optional_depends  "epplet-base"  ""  ""  "for epplets"                       &&
-optional_depends  "equate"       ""  ""  "for a calculator"                  &&
-optional_depends  "erss"         ""  ""  "for a RSS feed reader"             &&
-optional_depends  "euphoria"     ""  ""  "for an audio player"               &&
-optional_depends  "evidence"     ""  ""  "for a file manager"                &&
-optional_depends  "iconbar"      ""  ""  "for a standalone iconbar"          &&
-optional_depends  "e_modules"    ""  ""  "for extra modules"                 &&
-optional_depends  "e17genmenu"   ""  ""  "for a menu generator"              &&
-optional_depends  "e_utils"      ""  ""  "for menu and background editor"    &&
-optional_depends  "eclair"       ""  ""  "for a media player"
+depends  enlightenment

==== //sgl/grimoires/test/e/e-profile/DETAILS#3 (xtext) ====

@@ -2,8 +2,13 @@
          VERSION=0.1
         WEB_SITE=http://www.enlightenment.org
          ENTERED=20040416
-         UPDATED=20040416
-           SHORT="The Enlightenment Project profile"
+      PATCHLEVEL=2
+        KEYWORDS="enlightenment"
+           SHORT="The Enlightenment R17 Project profile"
 cat << EOF
-The Enlightenment Project covers more than simple window management. It provides advanced graphical libraries, tools, and environments. Currently, the project is made up of three different components: Enlightenment DR16, The Enlightenment Foundation Libraries, and Enlightenment DR17.
+The Enlightenment R17 Project covers more than simple window management. It
+provides advanced graphical libraries, tools, and environments. Currently, the
+project is made up of three different components: Enlightenment DR16, The
+Enlightenment Foundation Libraries, and Enlightenment DR17. This profile is for
+the latter two.
 EOF

==== //sgl/grimoires/test/e/e-profile/HISTORY#6 (text) ====

@@ -1,3 +1,8 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* Deprecated in favour of using the enlightenment profile
+	* DEPENDS: Depend only on enlightenment
+	* TRIGGERS: On cast e-profile, dispel self
+
 2005-09-21 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, section-wide now
 

==== //sgl/grimoires/test/e/e_module-calendar/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-calendar/HISTORY#6 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/e_module-devian/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-devian/HISTORY#6 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/e_module-eloquence/DEPENDS#3 (xtext) ====

@@ -5,9 +5,9 @@
                 mpd)  depends mpd                ;;
 esac &&
 
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-eloquence/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/e_module-evolume/DEPENDS#2 (xtext) ====

@@ -1,7 +1,7 @@
-depends  alsa-lib       &&
-depends  edje           &&
-depends  ecore          &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  alsa-lib  &&
+depends  edje      &&
+depends  ecore     &&
+depends  eet       &&
+depends  e17       &&
+depends  esmart    &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-evolume/HISTORY#5 (text) ====

@@ -1,3 +1,9 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* CONFLICTS: Deprecated evolume removed
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/e_module-mount/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-mount/HISTORY#5 (text) ====

@@ -1,3 +1,9 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* CONFLICTS: Removed deprecated mount
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/e_module-screenshot/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-screenshot/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/e_module-slideshow/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-slideshow/HISTORY#6 (text) ====

@@ -1,3 +1,9 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* CONFLICTS: Removed deprecated slideshow
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/e_module-tclock/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/e_module-tclock/HISTORY#4 (text) ====

@@ -1,3 +1,9 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* CONFLICTS: Removed deprecated tclock
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/econf/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  ecore          &&
-depends  edje           &&
-depends  eet            &&
-depends  enlightenment  &&
-depends  esmart         &&
+depends  ecore   &&
+depends  edje    &&
+depends  eet     &&
+depends  e17     &&
+depends  esmart  &&
 depends  evas

==== //sgl/grimoires/test/e/econf/HISTORY#4 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/enlightenment/BUILD#6 (xtext) ====

@@ -1,4 +1,1 @@
-OPTS="--enable-fsstd  \
-      $OPTS"          &&
-
-default_build
+true

==== //sgl/grimoires/test/e/enlightenment/DEPENDS#6 (xtext) ====

@@ -1,11 +1,56 @@
-depends  imlib2  &&
-
 #
-# End e17 spell switch
+# Enlightenment E16 dependencies and optional dependencies
 #
+if  [  "$EPROFILE_E16"  ==  "y"  ];  then
+  depends  e16  &&
 
-if  [  "$ENLIGHTENMENT_CVS"  ==  "y"  ];  then
-  depends  CVS
+  optional_depends  epplet-base  ''  ''  'for plugins'        &&
+  optional_depends  exmms        ''  ''  'for a XMMS epplet'
 fi  &&
 
-optional_depends  esound  ""  ""  "for sound support"
+#
+# Enlightenment DR17 dependencies and optional dependencies
+#
+if  [  "$EPROFILE_E17"  ==  "y"  ];  then
+  depends  e17  &&
+
+  optional_depends  e_module-calendar   '' '' 'for a calendar'               &&
+  optional_depends  e_module-devian     '' '' 'for a desktop image tool'     &&
+  optional_depends  e_module-eloquence  '' '' 'for on-screen music titles'   &&
+  optional_depends  e_module-evolume    '' '' 'for a sound mixer'            &&
+  optional_depends  e_module-mount      '' '' 'for a device mounter'         &&
+  optional_depends  e_module-screenshot '' '' 'for easy screenshots'         &&
+  optional_depends  e_module-slideshow  '' '' 'to cycle desktop backgrounds' &&
+  optional_depends  e_module-tclock     '' '' 'for a digital clock'          &&
+  optional_depends  e_modules    ''  ''  'for extra modules'                 &&
+  optional_depends  e_utils      ''  ''  'for menu and background editor'    &&
+  optional_depends  e17genmenu   ''  ''  'for a menu generator'              &&
+  optional_depends  eclair       ''  ''  'for a media player'                &&
+  optional_depends  eclips       ''  ''  'for an image viewer'               &&
+  optional_depends  econf        ''  ''  'for an ETK E17 configuration tool' &&
+  optional_depends  eterm        ''  ''  'for a terminal emulator'           &&
+  optional_depends  elapse       ''  ''  'for a clock'                       &&
+  optional_depends  elation      ''  ''  'for a media player'                &&
+  optional_depends  elicit       ''  ''  'for a color picker and zoom tool'  &&
+  optional_depends  embrace      ''  ''  'for a mail checker'                &&
+  optional_depends  engage       ''  ''  'for a docker'                      &&
+  optional_depends  enotes       ''  ''  'for a sticky notes system'         &&
+  optional_depends  enscribe     ''  ''  'for a simple text editor'          &&
+  optional_depends  enterminus   ''  ''  'for a terminal'                    &&
+  optional_depends  entice       ''  ''  'for an image viewer'               &&
+  optional_depends  entrance     ''  ''  'for a display manager'             &&
+  optional_depends  entropy      ''  ''  'for a file browser'                &&
+  optional_depends  envision     ''  ''  'for a video player'                &&
+  optional_depends  epdf         ''  ''  'for a PDF/PostScript viewer'       &&
+  optional_depends  ephoto       ''  ''  'for a photo presenter'             &&
+  optional_depends  eplayer      ''  ''  'for an OggVorbis audio player'     &&
+  optional_depends  equate       ''  ''  'for a calculator'                  &&
+  optional_depends  erme         ''  ''  'for a perl E17 configuration tool' &&
+  optional_depends  erss         ''  ''  'for a RSS feed reader'             &&
+  optional_depends  eterm        ''  ''  'for a vt102 terminal'              &&
+  optional_depends  euphoria     ''  ''  'for an audio player'               &&
+  optional_depends  evidence     ''  ''  'for a file manager'                &&
+  optional_depends  exhibit      ''  ''  'for an ETK-based image viewer'     &&
+  optional_depends  express      ''  ''  'for an instant messenger'          &&
+  optional_depends  iconbar      ''  ''  'for a standalone iconbar'
+fi

==== //sgl/grimoires/test/e/enlightenment/DETAILS#10 (xtext) ====

@@ -1,37 +1,9 @@
            SPELL=enlightenment
-if  [  "$ENLIGHTENMENT_CVS"  ==  "y"  ];  then
-  if  [  "$ENLIGHTENMENT_CVS_AUTOUPDATE"  ==  "y"  ];  then
-         VERSION=$(date +%Y%m%d)
-  else
-         VERSION=cvs
-  fi
-          SOURCE=$SPELL-0.16-cvs.tar.bz2
-  FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs
-   SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.enlightenment.org:/var/cvs/e:e16/e
-   SOURCE_IGNORE=volatile
-else
-         VERSION=0.16.8.1
-          SOURCE=e16-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/e16-${VERSION%-*}
-   SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
-
-     SOURCE_HASH=sha512:2f59a2600ea69ddbfa1aa72064d942552cef4209d8c7e1d865f48956d938ec206bad4723a0d5036eb25f2eabe47ef2affcb95c00d23d7a79a790f823db23b55b
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
-fi
+         VERSION=1.0
       LICENSE[0]=BSD
-      PATCHLEVEL=2
+        KEYWORDS="enlightenment"
         WEB_SITE=http://www.enlightenment.org/
-         ENTERED=20010922
-         UPDATED=20040517
-        KEYWORDS="enlightenment"
-           SHORT="E16 is a themeable, fast, flexible X11 windows Manager"
+         ENTERED=20060412
+           SHORT=''
 cat << EOF
-Enlightenment 16 is a themeable, fast, flexible, and powerful window
-manager that is designed to be as configurable as possible in both look
-and feel. In addition, Enlightenment provides an applet API that
-provides functionality somewhere between the GNOME applet system and
-Dock Apps from Afterstep/WindowMaker. The current design aim is for
-Enlightenment to become a desktop shell.
 EOF

==== //sgl/grimoires/test/e/enlightenment/FINAL#2 (xtext) ====

@@ -1,4 +1,4 @@
 #
-# Remove this file on 2006-03-10 for e17 spell conversion
+# Remove this file on 2006-05-12 for profile conversion
 #
-persistent_remove  E17_CONVERT
+persistent_remove  E16_CONVERT

==== //sgl/grimoires/test/e/enlightenment/HISTORY#18 (text) ====

@@ -1,176 +1,4 @@
-2006-03-30 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.8.1
-
-2006-03-28 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: new SOURCE_URL, CVS is no longer hosted on SF
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-02-15 Arjan Bouter <abouter at sourcemage.org>
-	* INSTALL: added
-
-2006-02-13 Eric Sandall <eric at sandall.us>
-	* DEPENDS,UP_TRIGGERS: Moved casting of e17 to UP_TRIGGERS from DEPENDS so
-	  that e17 is cast /after/ enlightenment (to avoid enlightenment removing
-	  files it tracked when it installed DR17).  Bug #10522.
-
-2006-02-10 Eric Sandall <eric at sandall.us>
-	* PREPARE: Removed extraneous '&&' that broke the if/fi
-	  Update removal date
-	* DETAILS: Updated to 0.16.8
-	  Remove '0.16' from dated CVS VERSION
-	  SOURCE renamed to e16 instead of $SPELL
-	  SOURCE_DIRECTORY renamed to e16 instead of $SPELL
-	  Incremented PATCHLEVEL to 2
-	* DEPENDS: Variable is E17_CONVERT not E17_UPDATE
-	  Update removal date
-	* INSTALL: Removed, e16 now installs the necessary scripts for us
-	* FINAL: Update removal date
-	  Spell persistent correctly
-	* startenlightenment: Removed, now e16 installs a starte16 script for us
-	* enlightenment.desktop: Removed, now e16 installs e16.desktop for us
-	* TODO: Rename this to e16 and have enlightenment a 'profile' package for
-	  both e16 and e17
-
-2005-12-18 Eric Sandall <eric at sandall.us>
-	* PREPARE: Removed e17 queries
-	  Save user choices to e17.p
-	  Removed e17 saved queries
-	  Renamed ENLIGHTENMENT16* to ENLIGHTENMENT*
-	  Added temporary E17_UPDATE variable
-	* DETAILS: ENLIGHTENMENT16_CVS renamed to ENLIGHTENMENT_CVS
-	  Added PATCHLEVEL=1
-	  Modified SHORT and long descriptions to mention E16
-	* DEPENDS: Remove e17 dependencies
-	  Added dependency on e17 if this was for building e17
-	  ENLIGHTENMENT16_CVS renamed to ENLIGHTENMENT_CVS
-	* PRE_BUILD: Removed e17 check
-	  ENLIGHTENMENT16_CVS renamed to ENLIGHTENMENT_CVS
-	* INSTALL: Removed e17update script installation
-	* FINAL: Removed E17_UPDATE variable
-	* e17update: Removed
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-11-01 Eric Sandall <eric at sandall.us>
-	* DETAILS: Added a CVS mirror (faster than SF.net, but 30 minutes behind)
-	  Use SOURCE_IGNORE=volatile instead of MD5[0]=IGNORE
-	  Shortened SHORT
-
-2005-10-29 Eric Sandall <eric at sandall.us>
-	* PREPARE: Re-worded auto-update query
-
-2005-10-18 Eric Sandall <eric at sandall.us>
-	* e17update: Simple script to update e17 'cvs' packages
-	* INSTALL: Install e17update for e17 only
-	  Use INSTALL_ROOT for installing other scripts as well
-	  Use `mkdir -p` for /usr/share/xsessions
-
-2005-09-27 Eric Sandall <eric at sandall.us>
-	* DEPENDS: Check ENLIGHTENMENT_CVS not just ENLIGHTENMENT
-
-2005-09-21 Eric Sandall <eric at sandall.us>
-	* Renamed DR17 to ENLIGHTENMENT_CVS
-	* PREPARE,DETAILS: Updated to proper multi-version support
-	  See http://www.sourcemage.org/grimoire/spell_multi_version
-	  Removed BUILD_API=2, section-wide now
-	* DEPENDS: Added missing dependency on CVS if needed
-	* BUILD,PRE_BUILD: BUILD renamed to PRE_BUILD
-	  Use NOCONFIGURE=ON ./autogen.sh
-	  Pass OPTS last
-
-2005-07-15 Ladislav Hagara <hgr at vabo.cz>
-	* PREPARE, DETAILS, BUILD: tested and submitted to grimoire [Bug 9206]
-
-2005-07-12 Jeremy Blosser <jblosser-smgl at firinn.org>
-	* PREPARE, DETAILS, BUILD: Add a DR16 CVS install option
-
-2005-03-17 Eric Sandall <eric at sansall.us>
-	* BUILD: Don't apply the noslodown.patch
-	* CONFIGURE,noslodown.patch: Removed
-	* startenlightenment: Moved the slowdown information to here
-
-2005-03-09 Eric Sandall <eric at sandall.us>
-	* CONFIGURE: Query for noslowdown.patch if using DR17
-	* BUILD: Apply noslowdown.patch if wanted and using DR17
-	* noslodown.patch: Remove artificial startup slowdown of DR17
-
-2005-01-12 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: cvs VERSION=$(date +%Y%m%d)
-
-2004-12-17 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7.2
-
-2004-12-15 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS, BUILD, DEPENDS: added support for E17
-	* PREPARE: added
-
-2004-09-02 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7.1
-
-2004-08-23 Eric Sandall <eric at sandall.us>
-	* INSTALL: Added to install startup scripts
-	* enlightenment.desktop, startenlightenment: Added startup scripts
-
-2004-07-25 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7
-
-2004-07-20 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7-pre6, BUILD_API=2
-	* BUILD: converted to BUILD_API=2
-
-2004-07-06 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7-pre5
-
-2004-06-21 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7-pre4
-
-2004-06-01 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7-0.65 (pre3)
-
-2004-05-17 Ladislav Hagara <hgr at vabo.cz>
-	* DEPENDS: now only imlib2 [Bug 6864] and esound
-	* BUILD: removed sedit, used default_build
-
-2004-05-13 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.16.7-0.60 (pre2)
-
-2003-11-06 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Version bump to 0.16.6, changed SOURCE_DIRECTORY to match
-
-2003-10-09 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Version bump to 0.16.6-pre8
-	* HISTORY: Minor fixing, to go with new format
-	* DEPENDS: Removed useless optional_depends on libhttp
-
-2003-08-26 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Bumped version to 0.16.6-pre6, hopefully the last -pre
-
-2003-08-19 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Bumped version to 0.16.6-pre5.
-
-2003-01-31 Tom Garland <tgarland at email.com>
-	* BUILD: Added $OPTS to BUILD file.
-
-2002-12-18 Tom Garland <tgarland at email.com>
-	* Fixed bug 1757, DETAILS formatting.
-
-2002-10-14 Laurent Wandrebeck <wandre.l at free.fr>
-	* Added SMGL Mirror URL.
-
-2002-10-08 Laurent Wandrebeck <wandre.l at free.fr>
-	* Make use of $SOURCEFORGE_URL.
-	* Updated WEB_SITE.
-
-2002-08-21 Laurent Wandrebeck <wandre.l at free.fr>
-	* Updated MD5[0] to reflect Grimoire Gurus Handbook 2.3.
-	* Updated HISTORY file format for the same reason.
-
-2002-08-19 Laurent Wandrebeck <wandre.l at free.fr>
-	* Added and filled up MD5[0] and LICENSE[0].
-
-2002-08-19 Laurent Wandrebeck <wandre.l at free.fr>
-	* Added missing HISTORY file.
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DETAILS,PREPARE,CONFIGURE,CONFLICTS,PRE_BUILD,BUILD,INSTALL,FINAL,
+	  UP_TRIGGERS: Created Enlightenment profile package
 

==== //sgl/grimoires/test/e/enlightenment/INSTALL#5 (xtext) ====

@@ -1,2 +1,1 @@
-default_install &&
-install_wmfiles
+true

==== //sgl/grimoires/test/e/enlightenment/PREPARE#6 (xtext) ====

@@ -1,41 +1,28 @@
 #
-# Code to keep user settings while switching to e17 spell
-# Remove on 2006-03-10
+# Code to keep user settings while switching to a profile package
+# Remove on 2006-05-12
 #
 if  [  "$ENLIGHTENMENT_CVS"  ==  "y"  ];  then
   #
-  # Don't overwrite e17 configuration if already set
+  # Don't overwrite e16 configuration if already set
   #
-  if  [  !  -f  $DEPENDS_CONFIG/e17.p  ];  then
-    echo  "ENLIGHTENMENT17_CVS=\"y\""  >  $DEPENDS_CONFIG/e17.p               &&
-    echo  "ENLIGHTENMENT17_CVS_AUTOUPDATE=\"$ENLIGHTENMENT_CVS_AUTOUPDATE\""  \
-          >>  $DEPENDS_CONFIG/e17.p
-  fi                                                                          &&
-  persistent_add  E17_CONVERT                                                 &&
-  E17_CONVERT="y"                                                             &&
+  if  [  !  -f  $DEPENDS_CONFIG/e16.p  ];  then
+    #
+    # ENLIGHTENMENT* variables renamed to E16*
+    #
+    echo  "E16_CVS=\"y\""  >  $DEPENDS_CONFIG/e16.p               &&
+    echo  "E16_CVS_AUTOUPDATE=\"$ENLIGHTENMENT_CVS_AUTOUPDATE\""  \
+          >>  $DEPENDS_CONFIG/e16.p
+  fi                                                              &&
+  persistent_add  E16_CONVERT                                     &&
+  E16_CONVERT="y"                                                 &&
 
   #
-  # Switch variable names
-  #
-             ENLIGHTENMENT_CVS=$ENLIGHTENMENT16_CVS             &&
-  ENLIGHTENMENT_CVS_AUTOUPDATE=$ENLIGHTENMENT16_CVS_AUTOUPDATE  &&
-
-
-  #
   # Remove old variables
   #
-  persistent_remove  ENLIGHTENMENT16_CVS  ENLIGHTENMENT16_CVS_AUTOUPDATE
-fi  &&
+  persistent_remove  ENLIGHTENMENT_CVS  ENLIGHTENMENT_CVS_AUTOUPDATE
+fi
 
 #
-# End e17 switch code
+# End profile switch code
 #
-
-config_query  ENLIGHTENMENT_CVS                                            \
-              "Do you want to use the DR16 development version from CVS?"  \
-              n                                                            &&
-
-if  [  "$ENLIGHTENMENT_CVS"  ==  "y"  ];  then
-  config_query  ENLIGHTENMENT_CVS_AUTOUPDATE                       \
-                "Automatically update on every system update?"  n
-fi

==== //sgl/grimoires/test/e/enlightenment/PRE_BUILD#3 (xtext) ====

@@ -1,6 +1,1 @@
-default_pre_build  &&
-
-if  [  "$ENLIGHTENMENT_CVS"  ==  "y"  ];  then
-  cd  $SOURCE_DIRECTORY         &&
-  NOCONFIGURE=ON  ./autogen.sh
-fi
+true

==== //sgl/grimoires/test/e/enlightenment/UP_TRIGGERS#2 (xtext) ====

@@ -1,6 +1,6 @@
 #
-# Remove on 2006-03-10
+# Remove on 2006-05-12
 #
-if  [  "$E17_CONVERT"  ==  "y"  ];  then
-  up_trigger  e17  cast_self
+if  [  "$E16_CONVERT"  ==  "y"  ];  then
+  up_trigger  e16  cast_self
 fi

==== //sgl/grimoires/test/e/erme/DEPENDS#2 (xtext) ====

@@ -1,3 +1,3 @@
-depends  enlightenment  &&
-depends  perl           &&
+depends  e17        &&
+depends  perl       &&
 depends  perl-gtk2

==== //sgl/grimoires/test/e/erme/HISTORY#4 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e17 (enlightenment is now a profile spell)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/e/exmms/DEPENDS#2 (xtext) ====

@@ -1,6 +1,6 @@
-depends  OPENGL         &&
-depends  autoconf       &&
-depends  automake       &&
-depends  xmms           &&
-depends  enlightenment  &&
+depends  OPENGL       &&
+depends  autoconf     &&
+depends  automake     &&
+depends  xmms         &&
+depends  e16          &&
 depends  epplet-base

==== //sgl/grimoires/test/e/exmms/HISTORY#9 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depends on e16 (not enlightenment, which is now a profile)
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 



More information about the SM-Commit mailing list